Ticket #5620: newforms_xmlfield2.diff

django/db/models/fields/__init__.py

@@ -1157 +1157 @@
         self.schema_path = schema_path
         Field.__init__(self, verbose_name, name, **kwargs)
 
+    def formfield(self, **kwargs):
+        defaults = {'form_class': curry(forms.XMLField, schema_path=self.schema_path)}
+        defaults.update(kwargs)
+        return super(XMLField, self).formfield(**defaults)
+
     def get_manipulator_field_objs(self):
         return [curry(oldforms.XMLLargeTextField, schema_path=self.schema_path)]
 

django/newforms/fields.py

@@ -32 +32 @@
     'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField',
     'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField',
     'ComboField', 'MultiValueField', 'FloatField', 'DecimalField',
-    'SplitDateTimeField', 'IPAddressField', 'FilePathField',
+    'SplitDateTimeField', 'IPAddressField', 'FilePathField', 'XMLField'
 )
 
 # These values, if given to to_python(), will trigger the self.required check.
@@ -782 +782 @@
 
     def __init__(self, *args, **kwargs):
         super(IPAddressField, self).__init__(ipv4_re, *args, **kwargs)
+
+class XMLField(CharField):
+    """
+    A field that validates XML content against a RelaxNG schema
+    """
+    def __init__(self, schema_path=None):
+        self.schema_path = schema_path
+
+    def clean(self, value):
+        from django.core.validators import RelaxNGCompact, ValidationError as OldValidationError
+        if self.schema_path:
+            try:
+                RelaxNGCompact(self.schema_path)(value, "")
+            except OldValidationError, e:
+                raise ValidationError(e.messages)
+        return value