Changeset 8348

Timestamp:

08/14/08 10:37:43 (4 months ago)

Author:

gwilson

Message:

Fixed #8206 -- Removed validate methods of Model and Model fields. They are are unsupported for 1.0 and will be replaced with more complete model validation (refs #6845).

Files:

• django/trunk/django/contrib/sessions/models.py (modified) (1 diff)
• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (4 diffs)
• django/trunk/tests/modeltests/validation (deleted)

django/trunk/django/contrib/sessions/models.py

@@ -66 +66 @@
-        except:
-            return {}
+
+from django.contrib import admin
+class SessionAdmin(admin.ModelAdmin):
+    pass

django/trunk/django/db/models/base.py

@@ -369 +369 @@
-    save_base.alters_data = True
-
-    def validate(self):
-        """
-        First coerces all fields on this instance to their proper Python types.
-        Then runs validation on every field. Returns a dictionary of
-        field_name -> error_list.
-        """
-        error_dict = {}
-        invalid_python = {}
-        for f in self._meta.fields:
-            try:
-                setattr(self, f.attname, f.to_python(getattr(self, f.attname, f.get_default())))
-            except validators.ValidationError, e:
-                error_dict[f.name] = e.messages
-                invalid_python[f.name] = 1
-        for f in self._meta.fields:
-            if f.name in invalid_python:
-                continue
-            errors = f.validate_full(getattr(self, f.attname, f.get_default()), self.__dict__)
-            if errors:
-                error_dict[f.name] = errors
-        return error_dict
-
-    def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):
-        """

django/trunk/django/db/models/fields/__init__.py

@@ -161 +161 @@
-    unique = property(unique)
-
-    def validate_full(self, field_data, all_data):
-        """
-        Returns a list of errors for this field. This is the main interface,
-        as it encapsulates some basic validation logic used by all fields.
-        Subclasses should implement validate(), not validate_full().
-        """
-        if not self.blank and not field_data:
-            return [_('This field is required.')]
-        try:
-            self.validate(field_data, all_data)
-        except validators.ValidationError, e:
-            return e.messages
-        return []
-
-    def validate(self, field_data, all_data):
-        """
-        Raises validators.ValidationError if field_data has any errors.
-        Subclasses should override this to specify field-specific validation
-        logic. This method should assume field_data has already been converted
-        into the appropriate data type by Field.to_python().
-        """
-        pass
-
-    def set_attributes_from_name(self, name):
-        self.name = name
@@ -751 +728 @@
-        return [oldforms.EmailField]
-
-    def validate(self, field_data, all_data):
-        validators.isValidEmail(field_data, all_data)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.EmailField}
@@ -830 +804 @@
-        return "IPAddressField"
-
-    def validate(self, field_data, all_data):
-        validators.isValidIPAddress4(field_data, None)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.IPAddressField}
@@ -877 +848 @@
-    def get_internal_type(self):
-        return "PhoneNumberField"
-
-    def validate(self, field_data, all_data):
-        validators.isValidPhone(field_data, all_data)
-
-    def formfield(self, **kwargs):