Merge 9e9f982 into 227d635

cove/lib/common.py

@@ -16,13 +16,15 @@
 from flattentool import unflatten
 from jsonschema import FormatChecker, RefResolver
 from jsonschema.exceptions import ValidationError
-from jsonschema.validators import Draft4Validator as validator
+import jsonschema.validators
 from django.utils.html import escape, conditional_escape, format_html
 
 from cove.lib.exceptions import cove_spreadsheet_conversion_error
 from cove.lib.tools import cached_get_request, decimal_default
 
-
+# Because we will be changing items on this validator, it's important we take a copy!
+# Otherwise we could cause conflicts with other software in the same process.
+validator = jsonschema.validators.extend(jsonschema.validators.Draft4Validator, validators={})
 uniqueItemsValidator = validator.VALIDATORS.pop("uniqueItems")
 LANGUAGE_RE = re.compile("^(.*_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$")
 validation_error_template_lookup = {'date-time': 'Date is not in the correct format',