Ticket #6845: 6845-against-7877.patch

a/AUTHORS

@@ -217 +217 @@
-    Igor Kolar <ike@email.si>
-    Gasper Koren
-    Martin Kosír <martin@martinkosir.net>
+    Honza Kral <Honza.Kral@gmail.com>
-    Meir Kriheli <http://mksoft.co.il/>
-    Bruce Kroeze <http://coderseye.com/>
-    krzysiek.pawlik@silvermedia.pl

a/django/contrib/admin/views/template.py

@@ -1 +1 @@
-from django.contrib.admin.views.decorators import staff_member_required
-ors
+ion
-from django import template, oldforms
-from django.template import loader
-from django.shortcuts import render_to_response
@@ -69 +69 @@
-            error = e
-        template.builtins.remove(register)
-        if error:
-ors
+ion

a/django/contrib/auth/forms.py

@@ -2 +2 @@
-from django.contrib.auth import authenticate
-from django.contrib.sites.models import Site
-from django.template import Context, loader
-core
+oldforms
-from django import oldforms
-from django.utils.translation import ugettext as _
-

a/django/contrib/auth/management/commands/createsuperuser.py

@@ -39 +39 @@
-            if not RE_VALID_USERNAME.match(username):
-                raise CommandError("Invalid username. Use only letters, digits, and underscores")
-            try:
-isValidEmail(email, None
+validate_email(email
-            except validators.ValidationError:
-                raise CommandError("Invalid email address.")
-

a/django/contrib/auth/models.py

@@ -135 +135 @@
-
-    Username and password are required. Other fields are optional.
-    """
-isAlphaN
+validate_alpha_n
-    first_name = models.CharField(_('first name'), max_length=30, blank=True)
-    last_name = models.CharField(_('last name'), max_length=30, blank=True)
-    email = models.EmailField(_('e-mail address'), blank=True)

a/django/contrib/comments/views/comments.py

@@ -1 @@
-core
+oldforms
-from django import oldforms
-from django.core.mail import mail_admins, mail_managers
-from django.http import Http404

a/django/contrib/flatpages/models.py

@@ -5 +5 @@
-
-
-class FlatPage(models.Model):
-isAlphaNumericURL
+validate_alpha_numeric
-        help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
-    title = models.CharField(_('title'), max_length=200)
-    content = models.TextField(_('content'), blank=True)

a/django/contrib/localflavor/br/forms.py

@@ -31 +31 @@
-    }
-
-    def clean(self, value):
-
+value = 
-        if value in EMPTY_VALUES:
-            return u''
-smart_unicode(value)
+value
-        m = phone_digits_re.search(value)
-        if m:
-            return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3))

a/django/contrib/localflavor/fi/forms.py

@@ -29 +29 @@
-    }
-
-    def clean(self, value):
-
-
+
+
+
+
+
-            return u''
-
-        checkmarks = "0123456789ABCDEFHJKLMNPRSTUVWXY"

a/django/contrib/localflavor/jp/forms.py

@@ -2 +2 @@
-JP-specific Form helpers
-"""
-
-from django.core import validators
-from django.newforms import ValidationError
-from django.utils.translation import ugettext_lazy as _
-from django.newforms.fields import RegexField, Select

/dev/null

@@ +1 @@
+from django.utils.encoding import smart_unicode, StrAndUnicode, force_unicode
+from django.utils.safestring import mark_safe
+
+NON_FIELD_ERRORS = '__all__'
+
+class ErrorList(list, StrAndUnicode):
+    """
+    A collection of errors that knows how to display itself in various formats.
+    """
+    def __unicode__(self):
+        return self.as_ul()
+
+    def as_ul(self):
+        if not self: return u''
+        return mark_safe(u'<ul class="errorlist">%s</ul>'
+                % ''.join([u'<li>%s</li>' % force_unicode(e) for e in self]))
+
+    def as_text(self):
+        if not self: return u''
+        return u'\n'.join([u'* %s' % force_unicode(e) for e in self])
+
+    def __repr__(self):
+        return repr([force_unicode(e) for e in self])
+
+class ValidationError(Exception):
+    def __init__(self, message):
+        """
+        ValidationError can be passed any object that can be printed (usually
+        a string) or a list of objects.
+        """
+        if hasattr(message, '__iter__'):
+            self.messages = ErrorList([smart_unicode(msg) for msg in message])
+        else:
+            message = smart_unicode(message)
+            self.messages = ErrorList([message])
+
+        if isinstance(message, dict):
+            self.message_dict = message
+
+    def __str__(self):
+        # This is needed because, without a __str__(), printing an exception
+        # instance would result in this:
+        # AttributeError: ValidationError instance has no attribute 'args'
+        # See http://www.python.org/doc/current/tut/node10.html#handling
+        if hasattr(self, 'message_dict'):
+            return repr(self.message_dict)
+        return repr(self.messages)
+
+class TypeCoercionError(ValidationError):
+    pass

a/django/core/validators.py

@@ -1 +1 @@
-"""
-A library of validators that return None and raise ValidationError when the
-provided data isn't valid.
-
-Validators may be callable classes, and they may have an 'always_test'
-attribute. If an 'always_test' attribute exists (regardless of value), the
-validator will *always* be run, regardless of whether its associated
-form field is required.
-"""
-
-import urllib2
-import re
-
-
-
-
+
-
-from django.conf import settings
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-_datere = r'\d{4}-\d{1,2}-\d{1,2}'
-_timere = r'(?:[01]?[0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9])?'
-alnum_re = re.compile(r'^\w+$')
-alnumurl_re = re.compile(r'^[-\w/]+$')
-ansi_date_re = re.compile('^%s$' % _datere)
-ansi_time_re = re.compile('^%s$' % _timere)
-ansi_datetime_re = re.compile('^%s %s$' % (_datere, _timere))
-email_re = re.compile(
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
-    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"' # quoted-string
-    r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain
-integer_re = re.compile(r'^-?\d+$')
-ip4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$')
-phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
-slug_re = re.compile(r'^[-\w]+$')
-url_re = re.compile(r'^https?://\S+$')
-
-lazy_inter = lazy(lambda a,b: force_unicode(a) % b, unicode)
-
-class ValidationError(Exception):
-    def __init__(self, message):
-        "ValidationError can be passed a string or a list."
-        if isinstance(message, list):
-            self.messages = [force_unicode(msg) for msg in message]
-        else:
-            assert isinstance(message, (basestring, Promise)), ("%s should be a string" % repr(message))
-            self.messages = [force_unicode(message)]
-
-    def __str__(self):
-        # This is needed because, without a __str__(), printing an exception
-        # instance would result in this:
-        # AttributeError: ValidationError instance has no attribute 'args'
-        # See http://www.python.org/doc/current/tut/node10.html#handling
-        return str(self.messages)
-
-class CriticalValidationError(Exception):
-    def __init__(self, message):
-        "ValidationError can be passed a string or a list."
-        if isinstance(message, list):
-            self.messages = [force_unicode(msg) for msg in message]
-        else:
-            assert isinstance(message, (basestring, Promise)), ("'%s' should be a string" % message)
-            self.messages = [force_unicode(message)]
-
-    def __str__(self):
-        return str(self.messages)
-
-def isAlphaNumeric(field_data, all_data):
-    if not alnum_re.search(field_data):
-        raise ValidationError, _("This value must contain only letters, numbers and underscores.")
-
-def isAlphaNumericURL(field_data, all_data):
-    if not alnumurl_re.search(field_data):
-        raise ValidationError, _("This value must contain only letters, numbers, underscores, dashes or slashes.")
-
-def isSlug(field_data, all_data):
-    if not slug_re.search(field_data):
-        raise ValidationError, _("This value must contain only letters, numbers, underscores or hyphens.")
-
-def isLowerCase(field_data, all_data):
-    if field_data.lower() != field_data:
-        raise ValidationError, _("Uppercase letters are not allowed here.")
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-def isCommaSeparatedEmailList(field_data, all_data):
-    """
-    Checks that field_data is a string of e-mail addresses separated by commas.
-    Blank field_data values will not throw a validation error, and whitespace
-    is allowed around the commas.
-    """
-    for supposed_email in field_data.split(','):
-        try:
-            isValidEmail(supposed_email.strip(), '')
-        except ValidationError:
-            raise ValidationError, _("Enter valid e-mail addresses separated by commas.")
-
-def isValidIPAddress4(field_data, all_data):
-    if not ip4_re.search(field_data):
-        raise ValidationError, _("Please enter a valid IP address.")
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-# This differs from isOnlyDigits because this accepts the negative sign
-if not integer_re.search(field_data):
-    raise ValidationError, _("Enter a whole number."
+
+    re.compile(r'^[-\w]+$'), ('invalid',),
+    "This value must contain only letters, numbers, underscores or hyphens."
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    from datetime import date
-    # Could use time.strptime here and catch errors, but datetime.date below
-    # produces much friendlier error messages.
-date_string
+value
-    # This check is needed because strftime is used when saving the date
-    # value to the database, and strftime requires that the year be >=1900.
-    if year < 1900:
@@ -149 +98 @@
-        date(year, month, day)
-    except ValueError, e:
-        msg = _('Invalid date: %s') % _(str(e))
-        raise ValidationError, msg
-
-
-
-
-
+
+
+
-
-isValidANSITime(field_data, all_data
-if not ansi_time_re.search(field_data):
-    raise ValidationError, _('Enter a valid time in HH:MM format.'
+validate_ansi_datetime(value, message_dict={}
+validate_ansi_datetime_format(value, message_dict)
+validate_correct_ansi_date(value.split()[0], message_dict
-
-
-
-
-
+
+
+
-
-isValidEmail(field_data, all_data
-email_re.search(field_data
-'Enter a valid e-mail address.'
+validate_digits_only(value, message_dict={}
+value.isdigit(
+"Non-numeric characters aren't allowed here."
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-isValidPhone(field_data, all_data
-phone_re.search(field_data
-'Phone numbers must be in XXX-XXX-XXXX format. "%s" is invalid.') % field_data
+validate_letters_only(value, message_dict={}
+value.isalpha(
+"Only alphabetical characters are allowed here.")
-
-
-
-
-
-
-
-
+
+
+
-
-isValidURL(field_data, all_data
-not url_re.search(field_data)
-A valid URL is required
+validate_upper(value, message_dict={}
+value.upper() != value
+Lowercase letters are not allowed here
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-isExistingURL(field_data, all_data
+validate_existing_url(value, message_dict={}
-    try:
-        headers = {
-            "Accept" : "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
@@ -248 +159 @@
-            "Connection" : "close",
-            "User-Agent": settings.URL_VALIDATOR_USER_AGENT
-            }
-field_data
+value
-        u = urllib2.urlopen(req)
-    except ValueError:
-_("Invalid URL: %s") % field_data
+message_dict.get('invalid', _("Invalid URL: %s") % value)
-    except urllib2.HTTPError, e:
-        # 401s are valid; they just mean authorization is required.
-        # 301 and 302 are redirects; they just mean look somewhere else.
-        if str(e.code) not in ('401','301','302'):
-_("The URL %s is a broken link.") % field_data
+message_dict.get('invalid_link', _("This URL appears to be a broken link."))
-    except: # urllib2.URLError, httplib.InvalidURL, etc.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-class URLMimeTypeCheck(object):
-    "Checks that the provided URL points to a document with a listed mime type"
@@ -524 +181 @@
-    def __init__(self, mime_type_list):
-        self.mime_type_list = mime_type_list
-
-
-
-
-
-
-
+
+
-        try:
-field_data
+value
-        except (urllib2.HTTPError, urllib2.URLError):
-field_data
+value
-        content_type = info['content-type']
-        if content_type not in self.mime_type_list:
-            raise URLMimeTypeCheck.InvalidContentType, _("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

a/django/db/models/__init__.py

@@ -1 +1 @@
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.core import validators
-from django.db import connection
-from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
-from django.db.models.query import Q

a/django/db/models/base.py

@@ -11 +11 @@
-import django.db.models.manipulators    # Imported to register signal handler.
-import django.db.models.manager         # Ditto.
-from django.core import validators
+from django.core.validation import ValidationError, NON_FIELD_ERRORS
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError
-from django.db.models.fields import AutoField, ImageField, FieldDoesNotExist
-from django.db.models.fields.related import OneToOneRel, ManyToOneRel, OneToOneField
@@ -22 +23 @@
-from django.dispatch import dispatcher
-from django.utils.datastructures import SortedDict
-from django.utils.functional import curry
+from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_str, force_unicode, smart_unicode
-from django.core.files.move import file_move_safe
-from django.core.files import locks
@@ -352 +354 @@
-
-    save_base.alters_data = True
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        """
-
-
-
+
+
-        """
+        if new_data is not None:
+            def get_value(f):
+                if f.name in new_data:
+                    return f.to_python(new_data[f.name])
+                return getattr(self, f.attname, f.get_default())
+        else:
+            get_value = lambda f: getattr(self, f.attname, f.get_default())
-        error_dict = {}
-        invalid_python = {}
-        for f in self._meta.fields:
-            try:
-
-
+
+
+
+
+
-                error_dict[f.name] = e.messages
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):
-        """

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

@@ -12 +12 @@
-from django.db.models.query_utils import QueryWrapper
-from django.dispatch import dispatcher
-from django.conf import settings
+from django.oldforms import validators as oldvalidators
-from django.core import validators
-from django import oldforms
-from django import newforms as forms
@@ -81 +82 @@
-    creation_counter = 0
-    auto_creation_counter = -1
-
+    validators = []
+
-    def __init__(self, verbose_name=None, name=None, primary_key=False,
-            max_length=None, unique=False, blank=False, null=False,
-            db_index=False, core=False, rel=None, default=NOT_PROVIDED,
-            editable=True, serialize=True, prepopulate_from=None,
-            unique_for_date=None, unique_for_month=None, unique_for_year=None,
-            validator_list=None, choices=None, radio_admin=None, help_text='',
-
+, validators=[]
-        self.name = name
-        self.verbose_name = verbose_name
-        self.primary_key = primary_key
@@ -100 +103 @@
-        self.core, self.rel, self.default = core, rel, default
-        self.editable = editable
-        self.serialize = serialize
+        self.validators = validators + self.validators
-        self.validator_list = validator_list or []
-        self.prepopulate_from = prepopulate_from
-        self.unique_for_date, self.unique_for_month = unique_for_date, unique_for_month
@@ -167 +171 @@
-            return get_creation_module().DATA_TYPES[self.get_internal_type()] % data
-        except KeyError:
-            return None
-
-    def unique(self):
-        return self._unique or self.primary_key
-    unique = property(unique)
-
-_full(self, field_data, all_data
+(self, value, instance=None
-        """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        Subclasses should override this to specify field-specific validation
-field_data
+value
-        into the appropriate data type by Field.to_python().
-        """
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def set_attributes_from_name(self, name):
-        self.name = name
@@ -351 +353 @@
-                    core_field_names.extend(f.get_manipulator_field_names(name_prefix))
-            # Now, if there are any, add the validator to this FormField.
-            if core_field_names:
-
+old
-
-        # Finally, add the field_names.
-        field_names = self.get_manipulator_field_names(name_prefix)
@@ -547 +549 @@
-            return value.date()
-        if isinstance(value, datetime.date):
-            return value
-        validators.isValidANSIDate(value, None)
-        try:
-            return datetime.date(*time.strptime(value, '%Y-%m-%d')[:3])
-        except ValueError:
@@ -739 +740 @@
-        return super(DecimalField, self).formfield(**defaults)
-
-class EmailField(CharField):
+    validators = [validators.validate_email]
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 75)
-        CharField.__init__(self, *args, **kwargs)
@@ -746 +748 @@
-    def get_manipulator_field_objs(self):
-        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}
-        defaults.update(kwargs)
@@ -785 +784 @@
-                        self.always_test = True
-                    def __call__(self, field_data, all_data):
-                        if not all_data.get(self.other_file_field_name, False):
-
+old
-                            c(field_data, all_data)
-                # First, get the core fields, if any.
-                core_field_names = []
@@ -796 +795 @@
-                if core_field_names:
-                    field_list[0].validator_list.append(RequiredFileField(core_field_names, field_list[1].field_name))
-            else:
-
+old
-                v.always_test = True
-                field_list[0].validator_list.append(v)
-                field_list[0].is_required = field_list[1].is_required = False
@@ -964 +963 @@
-
-class IPAddressField(Field):
-    empty_strings_allowed = False
+    validators = [validators.validate_ip_address4]
+
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 15
-        Field.__init__(self, *args, **kwargs)
@@ -974 +975 @@
-    def get_internal_type(self):
-        return "IPAddressField"
-
-    def validate(self, field_data, all_data):
-        validators.isValidIPAddress4(field_data, None)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.IPAddressField}
-        defaults.update(kwargs)
@@ -1007 +1005 @@
-        return super(NullBooleanField, self).formfield(**defaults)
-
-class PhoneNumberField(IntegerField):
+    validators = [validators.validate_phone_number]
+
-    def get_manipulator_field_objs(self):
-        return [oldforms.PhoneNumberField]
-
-    def get_internal_type(self):
-        return "PhoneNumberField"
-
-    def validate(self, field_data, all_data):
-        validators.isValidPhone(field_data, all_data)
-
-    def formfield(self, **kwargs):
-        from django.contrib.localflavor.us.forms import USPhoneNumberField
-        defaults = {'form_class': USPhoneNumberField}
@@ -1047 +1044 @@
-        return super(PositiveSmallIntegerField, self).formfield(**defaults)
-
-class SlugField(CharField):
+    validators = [validators.validate_slug]
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 50)
-        kwargs.setdefault('validator_list', []).append(validators.isSlug)
-        # Set db_index=True unless it's been set manually.
-        if 'db_index' not in kwargs:
-            kwargs['db_index'] = True
@@ -1145 +1142 @@
-    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
-        kwargs['max_length'] = kwargs.get('max_length', 200)
-        if verify_exists:
-_list', []).append(validators.isExistingURL
+s', []).append(validators.validate_existing_url
-        self.verify_exists = verify_exists
-        CharField.__init__(self, verbose_name, name, **kwargs)
-

a/django/db/models/fields/related.py

@@ -802 +802 @@
-        objects = mod._default_manager.in_bulk(pks)
-        if len(objects) != len(pks):
-            badkeys = [k for k in pks if k not in objects]
-s
+_list
-                    "Please enter valid %(self)s IDs. The values %(value)r are invalid.", len(badkeys)) % {
-                'self': self.verbose_name,
-                'value': len(badkeys) == 1 and badkeys[0] or tuple(badkeys),

a/django/newforms/__init__.py

@@ -10 +10 @@
-    "This form field requires foo.js" and form.js_includes()
-"""
-
-util
+django.core.validation
-from widgets import *
-from fields import *
-from forms import *

a/django/newforms/fields.py

@@ -24 +24 @@
-
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import StrAndUnicode, smart_unicode, smart_str
+from django.core.validation import ValidationError, ErrorList, TypeCoercionError
+from django.core import validators
-
-from util import ErrorList, ValidationError
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput
-from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
-
@@ -46 +47 @@
-
-class Field(object):
-    widget = TextInput # Default widget to use when rendering this type of Field.
+    validators = []
-    hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
-    default_error_messages = {
-        'required': _(u'This field is required.'),
@@ -56 +58 @@
-    creation_counter = 0
-
-    def __init__(self, required=True, widget=None, label=None, initial=None,
-
+, validators=[]
-        # required -- Boolean that specifies whether the field is required.
-        #             True by default.
-        # widget -- A Widget class, or instance of a Widget class, that should
@@ -70 +72 @@
-        # initial -- A value to use in this Field's initial display. This value
-        #            is *not* used as a fallback if data isn't given.
-        # help_text -- An optional string to use as "help text" for this Field.
+        # validators -- Optional list of additional validator functions
-        if label is not None:
-            label = smart_unicode(label)
+        self.validators = self.validators + validators
-        self.required, self.label, self.initial = required, label, initial
-        self.help_text = smart_unicode(help_text or '')
-        widget = widget or self.widget
@@ -99 +103 @@
-        messages.update(error_messages or {})
-        self.error_messages = messages
-
+    def to_python(self, value):
+        if value in EMPTY_VALUES:
+            return None
+        return smart_unicode(value)
+
+    def validate(self, value):
+        if self.required and value in EMPTY_VALUES:
+            raise ValidationError(self.error_messages['required'])
+        elif value in EMPTY_VALUES:
+            return
+        elist = ErrorList()
+        for validator in self.validators:
+            try:
+                validator(value, self.error_messages)
+            except ValidationError, e:
+                elist.extend(e.messages)
+        if elist:
+            raise ValidationError(elist)
+
-    def clean(self, value):
-        """
-        Validates the given value and returns its "cleaned" value as an
@@ -106 +129 @@
-
-        Raises ValidationError for any errors.
-        """
-if self.required and value in EMPTY_VALUES:
-    raise ValidationError(self.error_messages['required']
+value = self.to_python(value)
+self.validate(value
-        return value
-
-    def widget_attrs(self, widget):
@@ -134 +157 @@
-        self.max_length, self.min_length = max_length, min_length
-        super(CharField, self).__init__(*args, **kwargs)
-
-
-
-
+
-        if value in EMPTY_VALUES:
-            return u''
-
+
+
+
+
+
-        value_length = len(value)
+        if value_length == 0 and not self.required:
+            return 
-        if self.max_length is not None and value_length > self.max_length:
-            raise ValidationError(self.error_messages['max_length'] % {'max': self.max_length, 'length': value_length})
-        if self.min_length is not None and value_length < self.min_length:
-            raise ValidationError(self.error_messages['min_length'] % {'min': self.min_length, 'length': value_length})
-        return value
-
-    def widget_attrs(self, widget):
-        if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
@@ -163 +189 @@
-        self.max_value, self.min_value = max_value, min_value
-        super(IntegerField, self).__init__(*args, **kwargs)
-
-
-
-
-
-
-
+
-        if value in EMPTY_VALUES:
-            return None
-        try:
-value = int(
+return int(smart_
-        except (ValueError, TypeError):
-
+
+
+
+
+
+
+
+
+
-        if self.max_value is not None and value > self.max_value:
-            raise ValidationError(self.error_messages['max_value'] % self.max_value)
-        if self.min_value is not None and value < self.min_value:
-            raise ValidationError(self.error_messages['min_value'] % self.min_value)
-        return value
-
-class FloatField(Field):
-    default_error_messages = {
@@ -192 +220 @@
-        self.max_value, self.min_value = max_value, min_value
-        Field.__init__(self, *args, **kwargs)
-
-clea
+to_pytho
-        """
-        Validates that float() can be called on the input. Returns a float.
-        Returns None for empty values.
-        """
-
-
+
-            return None
-        try:
-value =
+return
-        except (ValueError, TypeError):
-
+
+
+
+
+
-        if self.max_value is not None and value > self.max_value:
-            raise ValidationError(self.error_messages['max_value'] % self.max_value)
-        if self.min_value is not None and value < self.min_value:
-            raise ValidationError(self.error_messages['min_value'] % self.min_value)
-        return value
-
-class DecimalField(Field):
-    default_error_messages = {
@@ -225 +255 @@
-        self.max_digits, self.decimal_places = max_digits, decimal_places
-        Field.__init__(self, *args, **kwargs)
-
-clea
+to_pytho
-        """
-        Validates that the input is a decimal number. Returns a Decimal
-        instance. Returns None for empty values. Ensures that there are no more
-        than max_digits in the number, and no more than decimal_places digits
-        after the decimal point.
-        """
-
-
+
-            return None
-        value = smart_str(value).strip()
-        try:
-value =
+return
-        except DecimalException:
-
+
+
+
+
+
-        pieces = str(value).lstrip("-").split('.')
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])
@@ -253 +286 @@
-            raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places)
-        if self.max_digits is not None and self.decimal_places is not None and digits > (self.max_digits - self.decimal_places):
-            raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places))
-        return value
-
-DEFAULT_DATE_INPUT_FORMATS = (
-    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
@@ -272 +304 @@
-        super(DateField, self).__init__(*args, **kwargs)
-        self.input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS
-
-clea
+to_pytho
-        """
-        Validates that the input can be converted to a date. Returns a Python
-        datetime.date object.
-        """
-        super(DateField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return None
-        if isinstance(value, datetime.datetime):
@@ -289 +320 @@
-                return datetime.date(*time.strptime(value, format)[:3])
-            except ValueError:
-                continue
-Validat
+TypeCoerc
-
-DEFAULT_TIME_INPUT_FORMATS = (
-    '%H:%M:%S',     # '14:30:59'
@@ -305 +336 @@
-        super(TimeField, self).__init__(*args, **kwargs)
-        self.input_formats = input_formats or DEFAULT_TIME_INPUT_FORMATS
-
-clea
+to_pytho
-        """
-        Validates that the input can be converted to a time. Returns a Python
-        datetime.time object.
-        """
-        super(TimeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return None
-        if isinstance(value, datetime.time):
@@ -320 +350 @@
-                return datetime.time(*time.strptime(value, format)[3:6])
-            except ValueError:
-                continue
-Validat
+TypeCoerc
-
-DEFAULT_DATETIME_INPUT_FORMATS = (
-    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
@@ -344 +374 @@
-        super(DateTimeField, self).__init__(*args, **kwargs)
-        self.input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS
-
-clea
+to_pytho
-        """
-        Validates that the input can be converted to a datetime. Returns a
-        Python datetime.datetime object.
-        """
-        super(DateTimeField, self).clean(value)
-        if value in EMPTY_VALUES:
-            return None
-        if isinstance(value, datetime.datetime):
@@ -367 +396 @@
-                return datetime.datetime(*time.strptime(value, format)[:6])
-            except ValueError:
-                continue
-Validat
+TypeCoerc
-
-class RegexField(CharField):
-    def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs):
@@ -386 +415 @@
-            regex = re.compile(regex)
-        self.regex = regex
-
-clean
+validate
-        """
-        Validates that the input matches the regular expression. Returns a
-        Unicode object.
-        """
-value = super(RegexField, self).clean
+super(RegexField, self).validate
-        if value == u'':
- value
+
-        if not self.regex.search(value):
-            raise ValidationError(self.error_messages['invalid'])
-        return value
-
-email_re = re.compile(
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
-    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-    r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain
-
-Regex
+Char
-    default_error_messages = {
-        'invalid': _(u'Enter a valid e-mail address.'),
-    }
-
-
-
-
+
-
-try:
-    from django.conf import settings
@@ -424 +449 @@
-    widget = FileInput
-    default_error_messages = {
-        'invalid': _(u"No file was submitted. Check the encoding type on the form."),
-        'missing': _(u"No file was submitted."),
-        'empty': _(u"The submitted file is empty."),
-    }
-
-
-
-
-
-
+
-        if not self.required and data in EMPTY_VALUES:
-            return None
-        elif not data and initial:
@@ -448 +468 @@
-                category = DeprecationWarning,
-                stacklevel = 2
-            )
+            if not data:
+                raise ValidationError(self.error_messages['invalid'])
-            data = UploadedFile(data['filename'], data['content'])
-
-        try:
@@ -463 +485 @@
-
-        return data
-
+    def clean(self, value, initial=None):
+        "overriden clean to provide extra argument initial"
+        value = self.to_python(value, initial)
+        self.validate(value)
+        return value
+
-class ImageField(FileField):
-    default_error_messages = {
-        'invalid_image': _(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image."),
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        from PIL import Image
-
-        # We need to get a file object for PIL. We might have a path or we might
-        # have to read the data into memory.
-        if hasattr(data, 'temporary_file_path'):
@@ -487 +508 @@
-        else:
-            if hasattr(data, 'read'):
-                file = StringIO(data.read())
+            elif isinstance(data, UploadedFile):
+                file = StringIO(data.data.read())
-            else:
-StringIO(data['content'])
+data
-
-        try:
-            # load() is the only method that can spot a truncated JPEG,
@@ -507 +530 @@
-            trial_image.verify()
-        except Exception: # Python Imaging Library doesn't recognize it as an image
-            raise ValidationError(self.error_messages['invalid_image'])
-        return f
-
-url_re = re.compile(
-    r'^https?://' # http:// or https://
@@ -530 +552 @@
-        self.verify_exists = verify_exists
-        self.user_agent = validator_user_agent
-
-clea
-# If no URL scheme given, assume http://
+to_pytho
+value = super(URLField, self).to_python(value)
-        if value and '://' not in value:
-            value = u'http://%s' % value
-
+
+
+
+
+
-        if value == u'':
- value
+
-        if self.verify_exists:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-class BooleanField(Field):
-    widget = CheckboxInput
-
-clea
+to_pytho
-        """Returns a Python boolean object."""
-        # Explicitly check for the string 'False', which is what a hidden field
-        # will submit for False. Because bool("True") == True, we don't need to
@@ -567 +579 @@
-            value = False
-        else:
-            value = bool(value)
-        super(BooleanField, self).clean(value)
-        if not value and self.required:
-            raise ValidationError(self.error_messages['required'])
-        return value
-
+    def validate(self, value):
+        if self.required and not value:
+            raise ValidationError(self.error_messages['required'])
+
+
-class NullBooleanField(BooleanField):
-    """
-    A field whose valid values are None, True and False. Invalid values are
-    cleaned to None.
+
+    Note that validation doesn't apply here.
-    """
-    widget = NullBooleanSelect
-
-clea
+to_pytho
-        return {True: True, False: False}.get(value, None)
-
+    def validate(self, value):
+        pass
+
+
-class ChoiceField(Field):
-    widget = Select
-    default_error_messages = {
@@ -605 +625 @@
-
-    choices = property(_get_choices, _set_choices)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        valid_values = set([smart_unicode(k) for k, v in self.choices])
-        if value not in valid_values:
-            raise ValidationError(self.error_messages['invalid_choice'] % {'value': value})
-        return value
-
-class MultipleChoiceField(ChoiceField):
-    hidden_widget = MultipleHiddenInput
@@ -628 +641 @@
-        'invalid_list': _(u'Enter a list of values.'),
-    }
-
-clea
+to_pytho
-        """
-        Validates that the input is a list or tuple.
-        """
-
-
-
+
-            return []
-        if not isinstance(value, (list, tuple)):
-
-
+
+
+
+
-        # Validate that each value in the value list is in self.choices.
+        if self.required and value == []:
+            raise ValidationError(self.error_messages['required'])
-        valid_values = set([smart_unicode(k) for k, v in self.choices])
-new_
+
-            if val not in valid_values:
-                raise ValidationError(self.error_messages['invalid_choice'] % {'value': val})
-        return new_value
-
-class ComboField(Field):
-    """
@@ -659 +673 @@
-            f.required = False
-        self.fields = fields
-
-
+
+
+
+
+
+
-        """
-        Validates the given value against all of self.fields, which is a
-        list of Field instances.
-        """
-clean
+validate
-        for field in self.fields:
-
-
+
-
-class MultiValueField(Field):
-    """
@@ -699 +717 @@
-            f.required = False
-        self.fields = fields
-
-clea
+to_pytho
-        """
-        Validates every value in the given list. A value is validated against
-        the corresponding Field in self.fields.
@@ -713 +731 @@
-        if not value or isinstance(value, (list, tuple)):
-            if not value or not [v for v in value if v not in EMPTY_VALUES]:
-                if self.required:
-aise ValidationError(self.error_messages['required'])
+eturn None
-                else:
-                    return self.compress([])
-        else:
-
+
+
-        for i, field in enumerate(self.fields):
-            try:
-                field_value = value[i]
@@ -801 +820 @@
-            return datetime.datetime.combine(*data_list)
-        return None
-
-
-
-
+
-    default_error_messages = {
-        'invalid': _(u'Enter a valid IPv4 address.'),
-    }
-
-
-
+

a/django/newforms/forms.py

@@ -8 +8 @@
-from django.utils.html import escape
-from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
-from django.utils.safestring import mark_safe
+from django.core.validation import ValidationError, ErrorList, NON_FIELD_ERRORS
-
-from fields import Field, FileField
-from widgets import TextInput, Textarea
-, ErrorList, ValidationError
+
-
-__all__ = ('BaseForm', 'Form')
-
-NON_FIELD_ERRORS = '__all__'
-
-def pretty_name(name):
-    "Converts 'first_name' to 'First name'"
@@ -206 +206 @@
-                else:
-                    value = field.clean(value)
-                self.cleaned_data[name] = value
+                # FIXME deprecated - keeping this here for backwards compatibility
-                if hasattr(self, 'clean_%s' % name):
-                    value = getattr(self, 'clean_%s' % name)()
-                    self.cleaned_data[name] = value
+
+                if hasattr(self, 'validate_%s' % name):
+                    getattr(self, 'validate_%s' % name)(value)
-            except ValidationError, e:
-                self._errors[name] = e.messages
-                if name in self.cleaned_data:
-                    del self.cleaned_data[name]
-        try:
-cleaned_data = self.clean
+validate
-        except ValidationError, e:
-
+
+
+
+
+
-        if self._errors:
-            delattr(self, 'cleaned_data')
-
-    def clean(self):
-        """
+        FIXME: deprecated, use validate() instead
+
-        Hook for doing any extra form-wide cleaning after Field.clean() been
-        called on every field. Any ValidationError raised by this method will
-        not be associated with a particular field; it will have a special-case
@@ -229 +239 @@
-        """
-        return self.cleaned_data
-
+    def validate(self):
+        self.cleaned_data = self.clean()
+
-    def is_multipart(self):
-        """
-        Returns True if the form needs to be multipart-encrypted, i.e. it has

a/django/newforms/models.py

@@ -9 +9 @@
-from django.utils.encoding import smart_unicode
-from django.utils.datastructures import SortedDict
-from django.core.exceptions import ImproperlyConfigured
+from django.core.validation import ValidationError, ErrorList, TypeCoercionError
-
-from util import ValidationError, ErrorList
-from forms import BaseForm, get_declared_fields
-from fields import Field, ChoiceField, EMPTY_VALUES
-from widgets import Select, SelectMultiple, MultipleHiddenInput
@@ -258 +258 @@
-            object_data.update(initial)
-        BaseForm.__init__(self, data, files, auto_id, prefix, object_data, error_class, label_suffix)
-
+    def validate(self):
+        super(BaseModelForm, self).validate()
+        if self._errors:
+            return
+        self.instance.clean(self.cleaned_data)
+
-    def save(self, commit=True):
-        """
-        Saves this ``form``'s cleaned_data into model instance
@@ -356 +362 @@
-
-    choices = property(_get_choices, ChoiceField._set_choices)
-
-
-
-
+
+
+
+
-            return None
-        try:
-            value = self.queryset.get(pk=value)
@@ -366 +373 @@
-            raise ValidationError(self.error_messages['invalid_choice'])
-        return value
-
+    def validate(self, value):
+        pass
+
-class ModelMultipleChoiceField(ModelChoiceField):
-    """A MultipleChoiceField whose choices are a model QuerySet."""
-    hidden_widget = MultipleHiddenInput
@@ -382 +392 @@
-            cache_choices, required, widget, label, initial, help_text,
-            *args, **kwargs)
-
-clea
+to_pytho
-        if self.required and not value:
-            raise ValidationError(self.error_messages['required'])
-        elif not self.required and not value:
-            return []
-        if not isinstance(value, (list, tuple)):
-Validat
+TypeCoerc
-        final_values = []
-        for val in value:
-            try:
@@ -398 +408 @@
-            else:
-                final_values.append(obj)
-        return final_values
+

a/django/newforms/util.py

@@ -30 +30 @@
-    def as_text(self):
-        return u'\n'.join([u'* %s\n%s' % (k, u'\n'.join([u'  * %s' % force_unicode(i) for i in v])) for k, v in self.items()])
-
-class ErrorList(list, StrAndUnicode):
-    """
-    A collection of errors that knows how to display itself in various formats.
-    """
-    def __unicode__(self):
-        return self.as_ul()
-
-    def as_ul(self):
-        if not self: return u''
-        return mark_safe(u'<ul class="errorlist">%s</ul>'
-                % ''.join([u'<li>%s</li>' % force_unicode(e) for e in self]))
-
-    def as_text(self):
-        if not self: return u''
-        return u'\n'.join([u'* %s' % force_unicode(e) for e in self])
-
-    def __repr__(self):
-        return repr([force_unicode(e) for e in self])
-
-class ValidationError(Exception):
-    def __init__(self, message):
-        """
-        ValidationError can be passed any object that can be printed (usually
-        a string) or a list of objects.
-        """
-        if isinstance(message, list):
-            self.messages = ErrorList([smart_unicode(msg) for msg in message])
-        else:
-            message = smart_unicode(message)
-            self.messages = ErrorList([message])
-
-    def __str__(self):
-        # This is needed because, without a __str__(), printing an exception
-        # instance would result in this:
-        # AttributeError: ValidationError instance has no attribute 'args'
-        # See http://www.python.org/doc/current/tut/node10.html#handling
-        return repr(self.messages)

a/django/oldforms/__init__.py

@@ -1 @@
-core
+oldforms
-from django.core.exceptions import PermissionDenied
-from django.utils.html import escape
-from django.utils.safestring import mark_safe

/dev/null

@@ +1 @@
+"""
+A library of validators that return None and raise ValidationError when the
+provided data isn't valid.
+
+Validators may be callable classes, and they may have an 'always_test'
+attribute. If an 'always_test' attribute exists (regardless of value), the
+validator will *always* be run, regardless of whether its associated
+form field is required.
+"""
+
+import urllib2
+import re
+try:
+    from decimal import Decimal, DecimalException
+except ImportError:
+    from django.utils._decimal import Decimal, DecimalException    # Python 2.3
+
+from django.conf import settings
+from django.utils.translation import ugettext as _, ugettext_lazy, ungettext
+from django.utils.functional import Promise, lazy
+from django.utils.encoding import force_unicode, smart_str
+from django.core.validation import ValidationError
+
+_datere = r'\d{4}-\d{1,2}-\d{1,2}'
+_timere = r'(?:[01]?[0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9])?'
+alnum_re = re.compile(r'^\w+$')
+alnumurl_re = re.compile(r'^[-\w/]+$')
+ansi_date_re = re.compile('^%s$' % _datere)
+ansi_time_re = re.compile('^%s$' % _timere)
+ansi_datetime_re = re.compile('^%s %s$' % (_datere, _timere))
+email_re = re.compile(
+    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
+    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"' # quoted-string
+    r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain
+integer_re = re.compile(r'^-?\d+$')
+ip4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$')
+phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
+slug_re = re.compile(r'^[-\w]+$')
+url_re = re.compile(r'^https?://\S+$')
+
+lazy_inter = lazy(lambda a,b: force_unicode(a) % b, unicode)
+
+
+class CriticalValidationError(Exception):
+    def __init__(self, message):
+        "ValidationError can be passed a string or a list."
+        if isinstance(message, list):
+            self.messages = [force_unicode(msg) for msg in message]
+        else:
+            assert isinstance(message, (basestring, Promise)), ("'%s' should be a string" % message)
+            self.messages = [force_unicode(message)]
+
+    def __str__(self):
+        return str(self.messages)
+
+
+def isAlphaNumeric(field_data, all_data):
+    # DONE
+    if not alnum_re.search(field_data):
+        raise ValidationError, _("This value must contain only letters, numbers and underscores.")
+
+def isAlphaNumericURL(field_data, all_data):
+    # DONE
+    if not alnumurl_re.search(field_data):
+        raise ValidationError, _("This value must contain only letters, numbers, underscores, dashes or slashes.")
+
+def isSlug(field_data, all_data):
+    # DONE
+    if not slug_re.search(field_data):
+        raise ValidationError, _("This value must contain only letters, numbers, underscores or hyphens.")
+
+def isLowerCase(field_data, all_data):
+    # DONE
+    if field_data.lower() != field_data:
+        raise ValidationError, _("Uppercase letters are not allowed here.")
+
+def isUpperCase(field_data, all_data):
+    # DONE
+    if field_data.upper() != field_data:
+        raise ValidationError, _("Lowercase letters are not allowed here.")
+
+def isCommaSeparatedIntegerList(field_data, all_data):
+    # DONE
+    for supposed_int in field_data.split(','):
+        try:
+            int(supposed_int)
+        except ValueError:
+            raise ValidationError, _("Enter only digits separated by commas.")
+
+def isCommaSeparatedEmailList(field_data, all_data):
+    # DONE
+    """
+    Checks that field_data is a string of e-mail addresses separated by commas.
+    Blank field_data values will not throw a validation error, and whitespace
+    is allowed around the commas.
+    """
+    for supposed_email in field_data.split(','):
+        try:
+            isValidEmail(supposed_email.strip(), '')
+        except ValidationError:
+            raise ValidationError, _("Enter valid e-mail addresses separated by commas.")
+
+def isValidIPAddress4(field_data, all_data):
+    # DONE
+    if not ip4_re.search(field_data):
+        raise ValidationError, _("Please enter a valid IP address.")
+
+def isNotEmpty(field_data, all_data):
+    # DONE
+    if field_data.strip() == '':
+        raise ValidationError, _("Empty values are not allowed here.")
+
+def isOnlyDigits(field_data, all_data):
+    # DONE
+    if not field_data.isdigit():
+        raise ValidationError, _("Non-numeric characters aren't allowed here.")
+
+def isNotOnlyDigits(field_data, all_data):
+    # DONE
+    if field_data.isdigit():
+        raise ValidationError, _("This value can't be comprised solely of digits.")
+
+def isInteger(field_data, all_data):
+    # DONE
+    # This differs from isOnlyDigits because this accepts the negative sign
+    if not integer_re.search(field_data):
+        raise ValidationError, _("Enter a whole number.")
+
+def isOnlyLetters(field_data, all_data):
+    # DONE
+    if not field_data.isalpha():
+        raise ValidationError, _("Only alphabetical characters are allowed here.")
+
+def _isValidDate(date_string):
+    # DONE
+    """
+    A helper function used by isValidANSIDate and isValidANSIDatetime to
+    check if the date is valid.  The date string is assumed to already be in
+    YYYY-MM-DD format.
+    """
+    from datetime import date
+    # Could use time.strptime here and catch errors, but datetime.date below
+    # produces much friendlier error messages.
+    year, month, day = map(int, date_string.split('-'))
+    # This check is needed because strftime is used when saving the date
+    # value to the database, and strftime requires that the year be >=1900.
+    if year < 1900:
+        raise ValidationError, _('Year must be 1900 or later.')
+    try:
+        date(year, month, day)
+    except ValueError, e:
+        msg = _('Invalid date: %s') % _(str(e))
+        raise ValidationError, msg
+
+def isValidANSIDate(field_data, all_data):
+    # DONE
+    if not ansi_date_re.search(field_data):
+        raise ValidationError, _('Enter a valid date in YYYY-MM-DD format.')
+    _isValidDate(field_data)
+
+def isValidANSITime(field_data, all_data):
+    # DONE
+    if not ansi_time_re.search(field_data):
+        raise ValidationError, _('Enter a valid time in HH:MM format.')
+
+def isValidANSIDatetime(field_data, all_data):
+    # DONE
+    if not ansi_datetime_re.search(field_data):
+        raise ValidationError, _('Enter a valid date/time in YYYY-MM-DD HH:MM format.')
+    _isValidDate(field_data.split()[0])
+
+def isValidEmail(field_data, all_data):
+    # DONE
+    if not email_re.search(field_data):
+        raise ValidationError, _('Enter a valid e-mail address.')
+
+def isValidImage(field_data, all_data):
+    """
+    Checks that the file-upload field data contains a valid image (GIF, JPG,
+    PNG, possibly others -- whatever the Python Imaging Library supports).
+    """
+    from PIL import Image
+    from cStringIO import StringIO
+    try:
+        content = field_data.read()
+    except TypeError:
+        raise ValidationError, _("No file was submitted. Check the encoding type on the form.")
+    try:
+        # load() is the only method that can spot a truncated JPEG,
+        #  but it cannot be called sanely after verify()
+        trial_image = Image.open(StringIO(content))
+        trial_image.load()
+        # verify() is the only method that can spot a corrupt PNG,
+        #  but it must be called immediately after the constructor
+        trial_image = Image.open(StringIO(content))
+        trial_image.verify()
+    except Exception: # Python Imaging Library doesn't recognize it as an image
+        raise ValidationError, _("Upload a valid image. The file you uploaded was either not an image or a corrupted image.")
+
+def isValidImageURL(field_data, all_data):
+    uc = URLMimeTypeCheck(('image/jpeg', 'image/gif', 'image/png'))
+    try:
+        uc(field_data, all_data)
+    except URLMimeTypeCheck.InvalidContentType:
+        raise ValidationError, _("The URL %s does not point to a valid image.") % field_data
+
+def isValidPhone(field_data, all_data):
+    if not phone_re.search(field_data):
+        raise ValidationError, _('Phone numbers must be in XXX-XXX-XXXX format. "%s" is invalid.') % field_data
+
+def isValidQuicktimeVideoURL(field_data, all_data):
+    "Checks that the given URL is a video that can be played by QuickTime (qt, mpeg)"
+    uc = URLMimeTypeCheck(('video/quicktime', 'video/mpeg',))
+    try:
+        uc(field_data, all_data)
+    except URLMimeTypeCheck.InvalidContentType:
+        raise ValidationError, _("The URL %s does not point to a valid QuickTime video.") % field_data
+
+def isValidURL(field_data, all_data):
+    if not url_re.search(field_data):
+        raise ValidationError, _("A valid URL is required.")
+
+def isValidHTML(field_data, all_data):
+    import urllib, urllib2
+    try:
+        u = urllib2.urlopen('http://validator.w3.org/check', urllib.urlencode({'fragment': field_data, 'output': 'xml'}))
+    except:
+        # Validator or Internet connection is unavailable. Fail silently.
+        return
+    html_is_valid = (u.headers.get('x-w3c-validator-status', 'Invalid') == 'Valid')
+    if html_is_valid:
+        return
+    from xml.dom.minidom import parseString
+    error_messages = [e.firstChild.wholeText for e in parseString(u.read()).getElementsByTagName('messages')[0].getElementsByTagName('msg')]
+    raise ValidationError, _("Valid HTML is required. Specific errors are:\n%s") % "\n".join(error_messages)
+
+def isWellFormedXml(field_data, all_data):
+    from xml.dom.minidom import parseString
+    try:
+        parseString(field_data)
+    except Exception, e: # Naked except because we're not sure what will be thrown
+        raise ValidationError, _("Badly formed XML: %s") % str(e)
+
+def isWellFormedXmlFragment(field_data, all_data):
+    isWellFormedXml('<root>%s</root>' % field_data, all_data)
+
+def isExistingURL(field_data, all_data):
+    try:
+        headers = {
+            "Accept" : "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
+            "Accept-Language" : "en-us,en;q=0.5",
+            "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7",
+            "Connection" : "close",
+            "User-Agent": settings.URL_VALIDATOR_USER_AGENT
+            }
+        req = urllib2.Request(field_data,None, headers)
+        u = urllib2.urlopen(req)
+    except ValueError:
+        raise ValidationError, _("Invalid URL: %s") % field_data
+    except urllib2.HTTPError, e:
+        # 401s are valid; they just mean authorization is required.
+        # 301 and 302 are redirects; they just mean look somewhere else.
+        if str(e.code) not in ('401','301','302'):
+            raise ValidationError, _("The URL %s is a broken link.") % field_data
+    except: # urllib2.URLError, httplib.InvalidURL, etc.
+        raise ValidationError, _("The URL %s is a broken link.") % field_data
+
+def isValidUSState(field_data, all_data):
+    "Checks that the given string is a valid two-letter U.S. state abbreviation"
+    states = ['AA', 'AE', 'AK', 'AL', 'AP', 'AR', 'AS', 'AZ', 'CA', 'CO', 'CT', 'DC', 'DE', 'FL', 'FM', 'GA', 'GU', 'HI', 'IA', 'ID', 'IL', 'IN', 'KS', 'KY', 'LA', 'MA', 'MD', 'ME', 'MH', 'MI', 'MN', 'MO', 'MP', 'MS', 'MT', 'NC', 'ND', 'NE', 'NH', 'NJ', 'NM', 'NV', 'NY', 'OH', 'OK', 'OR', 'PA', 'PR', 'PW', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VA', 'VI', 'VT', 'WA', 'WI', 'WV', 'WY']
+    if field_data.upper() not in states:
+        raise ValidationError, _("Enter a valid U.S. state abbreviation.")
+
+def hasNoProfanities(field_data, all_data):
+    """
+    Checks that the given string has no profanities in it. This does a simple
+    check for whether each profanity exists within the string, so 'fuck' will
+    catch 'motherfucker' as well. Raises a ValidationError such as:
+        Watch your mouth! The words "f--k" and "s--t" are not allowed here.
+    """
+    field_data = field_data.lower() # normalize
+    words_seen = [w for w in settings.PROFANITIES_LIST if w in field_data]
+    if words_seen:
+        from django.utils.text import get_text_list
+        plural = len(words_seen)
+        raise ValidationError, ungettext("Watch your mouth! The word %s is not allowed here.",
+            "Watch your mouth! The words %s are not allowed here.", plural) % \
+            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], _('and'))
+
+class AlwaysMatchesOtherField(object):
+    def __init__(self, other_field_name, error_message=None):
+        self.other = other_field_name
+        self.error_message = error_message or lazy_inter(ugettext_lazy("This field must match the '%s' field."), self.other)
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        if field_data != all_data[self.other]:
+            raise ValidationError, self.error_message
+
+class ValidateIfOtherFieldEquals(object):
+    def __init__(self, other_field, other_value, validator_list):
+        self.other_field, self.other_value = other_field, other_value
+        self.validator_list = validator_list
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        if self.other_field in all_data and all_data[self.other_field] == self.other_value:
+            for v in self.validator_list:
+                v(field_data, all_data)
+
+class RequiredIfOtherFieldNotGiven(object):
+    def __init__(self, other_field_name, error_message=ugettext_lazy("Please enter something for at least one field.")):
+        self.other, self.error_message = other_field_name, error_message
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        if not all_data.get(self.other, False) and not field_data:
+            raise ValidationError, self.error_message
+
+class RequiredIfOtherFieldsGiven(object):
+    def __init__(self, other_field_names, error_message=ugettext_lazy("Please enter both fields or leave them both empty.")):
+        self.other, self.error_message = other_field_names, error_message
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        for field in self.other:
+            if all_data.get(field, False) and not field_data:
+                raise ValidationError, self.error_message
+
+class RequiredIfOtherFieldGiven(RequiredIfOtherFieldsGiven):
+    "Like RequiredIfOtherFieldsGiven, but takes a single field name instead of a list."
+    def __init__(self, other_field_name, error_message=ugettext_lazy("Please enter both fields or leave them both empty.")):
+        RequiredIfOtherFieldsGiven.__init__(self, [other_field_name], error_message)
+
+class RequiredIfOtherFieldEquals(object):
+    def __init__(self, other_field, other_value, error_message=None, other_label=None):
+        self.other_field = other_field
+        self.other_value = other_value
+        other_label = other_label or other_value
+        self.error_message = error_message or lazy_inter(ugettext_lazy("This field must be given if %(field)s is %(value)s"), {
+            'field': other_field, 'value': other_label})
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        if self.other_field in all_data and all_data[self.other_field] == self.other_value and not field_data:
+            raise ValidationError(self.error_message)
+
+class RequiredIfOtherFieldDoesNotEqual(object):
+    def __init__(self, other_field, other_value, other_label=None, error_message=None):
+        self.other_field = other_field
+        self.other_value = other_value
+        other_label = other_label or other_value
+        self.error_message = error_message or lazy_inter(ugettext_lazy("This field must be given if %(field)s is not %(value)s"), {
+            'field': other_field, 'value': other_label})
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        if self.other_field in all_data and all_data[self.other_field] != self.other_value and not field_data:
+            raise ValidationError(self.error_message)
+
+class IsLessThanOtherField(object):
+    def __init__(self, other_field_name, error_message):
+        self.other, self.error_message = other_field_name, error_message
+
+    def __call__(self, field_data, all_data):
+        if field_data > all_data[self.other]:
+            raise ValidationError, self.error_message
+
+class UniqueAmongstFieldsWithPrefix(object):
+    def __init__(self, field_name, prefix, error_message):
+        self.field_name, self.prefix = field_name, prefix
+        self.error_message = error_message or ugettext_lazy("Duplicate values are not allowed.")
+
+    def __call__(self, field_data, all_data):
+        for field_name, value in all_data.items():
+            if field_name != self.field_name and value == field_data:
+                raise ValidationError, self.error_message
+
+class NumberIsInRange(object):
+    """
+    Validator that tests if a value is in a range (inclusive).
+    """
+    def __init__(self, lower=None, upper=None, error_message=''):
+        self.lower, self.upper = lower, upper
+        if not error_message:
+            if lower and upper:
+                 self.error_message = _("This value must be between %(lower)s and %(upper)s.") % {'lower': lower, 'upper': upper}
+            elif lower:
+                self.error_message = _("This value must be at least %s.") % lower
+            elif upper:
+                self.error_message = _("This value must be no more than %s.") % upper
+        else:
+            self.error_message = error_message
+
+    def __call__(self, field_data, all_data):
+        # Try to make the value numeric. If this fails, we assume another
+        # validator will catch the problem.
+        try:
+            val = float(field_data)
+        except ValueError:
+            return
+
+        # Now validate
+        if self.lower and self.upper and (val < self.lower or val > self.upper):
+            raise ValidationError(self.error_message)
+        elif self.lower and val < self.lower:
+            raise ValidationError(self.error_message)
+        elif self.upper and val > self.upper:
+            raise ValidationError(self.error_message)
+
+class IsAPowerOf(object):
+    """
+    Usage: If you create an instance of the IsPowerOf validator:
+        v = IsAPowerOf(2)
+    
+    The following calls will succeed:
+        v(4, None) 
+        v(8, None)
+        v(16, None)
+    
+    But this call:
+        v(17, None)
+    will raise "django.core.validators.ValidationError: ['This value must be a power of 2.']"
+    """
+    def __init__(self, power_of):
+        self.power_of = power_of
+
+    def __call__(self, field_data, all_data):
+        from math import log
+        val = log(int(field_data)) / log(self.power_of)
+        if val != int(val):
+            raise ValidationError, _("This value must be a power of %s.") % self.power_of
+
+class IsValidDecimal(object):
+    def __init__(self, max_digits, decimal_places):
+        self.max_digits, self.decimal_places = max_digits, decimal_places
+
+    def __call__(self, field_data, all_data):
+        try:
+            val = Decimal(field_data)
+        except DecimalException:
+            raise ValidationError, _("Please enter a valid decimal number.")
+
+        pieces = str(val).lstrip("-").split('.')
+        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
+        digits = len(pieces[0])
+
+        if digits + decimals > self.max_digits:
+            raise ValidationError, ungettext("Please enter a valid decimal number with at most %s total digit.",
+                "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits
+        if digits > (self.max_digits - self.decimal_places):
+            raise ValidationError, ungettext( "Please enter a valid decimal number with a whole part of at most %s digit.",
+                "Please enter a valid decimal number with a whole part of at most %s digits.", str(self.max_digits-self.decimal_places)) % str(self.max_digits-self.decimal_places)
+        if decimals > self.decimal_places:
+            raise ValidationError, ungettext("Please enter a valid decimal number with at most %s decimal place.",
+                "Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places
+
+def isValidFloat(field_data, all_data):
+    data = smart_str(field_data)
+    try:
+        float(data)
+    except ValueError:
+        raise ValidationError, _("Please enter a valid floating point number.")
+
+class HasAllowableSize(object):
+    """
+    Checks that the file-upload field data is a certain size. min_size and
+    max_size are measurements in bytes.
+    """
+    def __init__(self, min_size=None, max_size=None, min_error_message=None, max_error_message=None):
+        self.min_size, self.max_size = min_size, max_size
+        self.min_error_message = min_error_message or lazy_inter(ugettext_lazy("Make sure your uploaded file is at least %s bytes big."), min_size)
+        self.max_error_message = max_error_message or lazy_inter(ugettext_lazy("Make sure your uploaded file is at most %s bytes big."), max_size)
+
+    def __call__(self, field_data, all_data):
+        try:
+            content = field_data.read()
+        except TypeError:
+            raise ValidationError, ugettext_lazy("No file was submitted. Check the encoding type on the form.")
+        if self.min_size is not None and len(content) < self.min_size:
+            raise ValidationError, self.min_error_message
+        if self.max_size is not None and len(content) > self.max_size:
+            raise ValidationError, self.max_error_message
+
+class MatchesRegularExpression(object):
+    """
+    Checks that the field matches the given regular-expression. The regex
+    should be in string format, not already compiled.
+    """
+    def __init__(self, regexp, error_message=ugettext_lazy("The format for this field is wrong.")):
+        self.regexp = re.compile(regexp)
+        self.error_message = error_message
+
+    def __call__(self, field_data, all_data):
+        if not self.regexp.search(field_data):
+            raise ValidationError(self.error_message)
+
+class AnyValidator(object):
+    """
+    This validator tries all given validators. If any one of them succeeds,
+    validation passes. If none of them succeeds, the given message is thrown
+    as a validation error. The message is rather unspecific, so it's best to
+    specify one on instantiation.
+    """
+    def __init__(self, validator_list=None, error_message=ugettext_lazy("This field is invalid.")):
+        if validator_list is None: validator_list = []
+        self.validator_list = validator_list
+        self.error_message = error_message
+        for v in validator_list:
+            if hasattr(v, 'always_test'):
+                self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        for v in self.validator_list:
+            try:
+                v(field_data, all_data)
+                return
+            except ValidationError, e:
+                pass
+        raise ValidationError(self.error_message)
+
+class URLMimeTypeCheck(object):
+    "Checks that the provided URL points to a document with a listed mime type"
+    class CouldNotRetrieve(ValidationError):
+        pass
+    class InvalidContentType(ValidationError):
+        pass
+
+    def __init__(self, mime_type_list):
+        self.mime_type_list = mime_type_list
+
+    def __call__(self, field_data, all_data):
+        import urllib2
+        try:
+            isValidURL(field_data, all_data)
+        except ValidationError:
+            raise
+        try:
+            info = urllib2.urlopen(field_data).info()
+        except (urllib2.HTTPError, urllib2.URLError):
+            raise URLMimeTypeCheck.CouldNotRetrieve, _("Could not retrieve anything from %s.") % field_data
+        content_type = info['content-type']
+        if content_type not in self.mime_type_list:
+            raise URLMimeTypeCheck.InvalidContentType, _("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % {
+                'url': field_data, 'contenttype': content_type}
+
+class RelaxNGCompact(object):
+    "Validate against a Relax NG compact schema"
+    def __init__(self, schema_path, additional_root_element=None):
+        self.schema_path = schema_path
+        self.additional_root_element = additional_root_element
+
+    def __call__(self, field_data, all_data):
+        import os, tempfile
+        if self.additional_root_element:
+            field_data = '<%(are)s>%(data)s\n</%(are)s>' % {
+                'are': self.additional_root_element,
+                'data': field_data
+            }
+        filename = tempfile.mktemp() # Insecure, but nothing else worked
+        fp = open(filename, 'w')
+        fp.write(field_data)
+        fp.close()
+        if not os.path.exists(settings.JING_PATH):
+            raise Exception, "%s not found!" % settings.JING_PATH
+        p = os.popen('%s -c %s %s' % (settings.JING_PATH, self.schema_path, filename))
+        errors = [line.strip() for line in p.readlines()]
+        p.close()
+        os.unlink(filename)
+        display_errors = []
+        lines = field_data.split('\n')
+        for error in errors:
+            ignored, line, level, message = error.split(':', 3)
+            # Scrape the Jing error messages to reword them more nicely.
+            m = re.search(r'Expected "(.*?)" to terminate element starting on line (\d+)', message)
+            if m:
+                display_errors.append(_('Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "%(start)s".)') % \
+                    {'tag':m.group(1).replace('/', ''), 'line':m.group(2), 'start':lines[int(m.group(2)) - 1][:30]})
+                continue
+            if message.strip() == 'text not allowed here':
+                display_errors.append(_('Some text starting on line %(line)s is not allowed in that context. (Line starts with "%(start)s".)') % \
+                    {'line':line, 'start':lines[int(line) - 1][:30]})
+                continue
+            m = re.search(r'\s*attribute "(.*?)" not allowed at this point; ignored', message)
+            if m:
+                display_errors.append(_('"%(attr)s" on line %(line)s is an invalid attribute. (Line starts with "%(start)s".)') % \
+                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
+                continue
+            m = re.search(r'\s*unknown element "(.*?)"', message)
+            if m:
+                display_errors.append(_('"<%(tag)s>" on line %(line)s is an invalid tag. (Line starts with "%(start)s".)') % \
+                    {'tag':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
+                continue
+            if message.strip() == 'required attributes missing':
+                display_errors.append(_('A tag on line %(line)s is missing one or more required attributes. (Line starts with "%(start)s".)') % \
+                    {'line':line, 'start':lines[int(line) - 1][:30]})
+                continue
+            m = re.search(r'\s*bad value for attribute "(.*?)"', message)
+            if m:
+                display_errors.append(_('The "%(attr)s" attribute on line %(line)s has an invalid value. (Line starts with "%(start)s".)') % \
+                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
+                continue
+            # Failing all those checks, use the default error message.
+            display_error = 'Line %s: %s [%s]' % (line, message, level.strip())
+            display_errors.append(display_error)
+        if len(display_errors) > 0:
+            raise ValidationError, display_errors

a/tests/modeltests/manipulators/models.py

@@ -99 +99 @@
-datetime.date(2005, 2, 13)
-
-# Test isValidFloat Unicode coercion
-core
+oldforms
->>> try: isValidFloat(u"ä", None)
-... except ValidationError: pass
-"""}

a/tests/modeltests/model_forms/models.py

@@ -485 +485 @@
-...         model = Article
->>> f = ArticleForm({'headline': u'The walrus was Paul', 'slug': u'walrus-was-paul', 'pub_date': u'1967-11-01',
-...     'writer': u'1', 'article': u'Test.', 'categories': [u'1', u'2']})
+>>> f.is_valid()
+True
->>> new_art = f.save()
->>> new_art.id
-2
@@ -712 +714 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# Add a Category object *after* the ModelMultipleChoiceField has already been
-# instantiated. This proves clean() checks the database during clean() rather
@@ -859 +861 @@
->>> instance.delete()
-
-# Test the non-required FileField
-
+
->>> f = TextFileForm(data={'description': u'Assistance'})
->>> f.fields['file'].required = False
->>> f.is_valid()
-
-
-
-
+
+
+
-
->>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': SimpleUploadedFile('test3.txt', 'hello world')}, instance=instance)
->>> f.is_valid()
@@ -968 +969 @@
->>> f = ImageFileForm(data={'description': u'Test'})
->>> f.fields['image'].required = False
->>> f.is_valid()
-Tru
-instance = f.save()
-
-
+Fals
+f.errors
+
+
-
->>> f = ImageFileForm(data={'description': u'And a final one'}, files={'image': SimpleUploadedFile('test3.png', image_data)}, instance=instance)
->>> f.is_valid()

a/tests/modeltests/validation/models.py

@@ -3 +3 @@
-
-This is an experimental feature!
-
-validate
+clean
-validation errors in the instance's fields. This method has a side effect
-of converting each field to its appropriate Python data type.
-"""
@@ -15 +15 @@
-    name = models.CharField(max_length=20)
-    birthdate = models.DateField()
-    favorite_moment = models.DateTimeField()
-
-
+
+
+
+
-    def __unicode__(self):
-        return self.name
-
@@ -30 +32 @@
-...     'favorite_moment': datetime.datetime(2002, 4, 3, 13, 23),
-...     'email': 'john@example.com'
-... }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
->>> p.id
-23
-
-
-
-
+
+
+
+
+
+
-
->>> p = Person(**dict(valid_params, id=None))
-
-
+
->>> repr(p.id)
-'None'
-
->>> p = Person(**dict(valid_params, is_child='t'))
-
-
+
->>> p.is_child
-True
-
->>> p = Person(**dict(valid_params, is_child='f'))
-
-
+
->>> p.is_child
-False
-
->>> p = Person(**dict(valid_params, is_child=True))
-
-
+
->>> p.is_child
-True
-
->>> p = Person(**dict(valid_params, is_child=False))
-
-
+
->>> p.is_child
-False
-
->>> p = Person(**dict(valid_params, is_child='foo'))
-
-
+
+
+
+
-
->>> p = Person(**dict(valid_params, name=u'Jose'))
-
-
+
->>> p.name
-u'Jose'
-
->>> p = Person(**dict(valid_params, name=227))
-
-
+
->>> p.name
-u'227'
-
->>> p = Person(**dict(valid_params, birthdate=datetime.date(2000, 5, 3)))
-
-
+
->>> p.birthdate
-datetime.date(2000, 5, 3)
-
->>> p = Person(**dict(valid_params, birthdate=datetime.datetime(2000, 5, 3)))
-
-
+
->>> p.birthdate
-datetime.date(2000, 5, 3)
-
->>> p = Person(**dict(valid_params, birthdate='2000-05-03'))
-
-
+
->>> p.birthdate
-datetime.date(2000, 5, 3)
-
->>> p = Person(**dict(valid_params, birthdate='2000-5-3'))
-
-
+
->>> p.birthdate
-datetime.date(2000, 5, 3)
-
->>> p = Person(**dict(valid_params, birthdate='foo'))
-
-
+
+
+
+
-
->>> p = Person(**dict(valid_params, favorite_moment=datetime.datetime(2002, 4, 3, 13, 23)))
-
-
+
->>> p.favorite_moment
-datetime.datetime(2002, 4, 3, 13, 23)
-
->>> p = Person(**dict(valid_params, favorite_moment=datetime.datetime(2002, 4, 3)))
-
-
+
->>> p.favorite_moment
-datetime.datetime(2002, 4, 3, 0, 0)
-
->>> p = Person(**dict(valid_params, email='john@example.com'))
-
-
+
->>> p.email
-'john@example.com'
-
->>> p = Person(**dict(valid_params, email=u'john@example.com'))
-
-
+
->>> p.email
-u'john@example.com'
-
->>> p = Person(**dict(valid_params, email=22))
-
-
+
+
+
+
-
-# Make sure that Date and DateTime return validation errors and don't raise Python errors.
-
-
-
+
+
+
+
+
+
-[u'This field is required.']
->>> errors['birthdate']
-[u'This field is required.']
-
-"""}

/dev/null

@@ +1 @@
+# A models.py so that tests run.
+

/dev/null

@@ +1 @@
+tests = r"""
+###################
+# ValidationError #
+###################
+>>> from django.core.exceptions import ValidationError
+>>> from django.utils.translation import ugettext_lazy
+
+# Can take a string.
+>>> print ValidationError("There was an error.").messages
+<ul class="errorlist"><li>There was an error.</li></ul>
+
+# Can take a unicode string.
+>>> print ValidationError(u"Not \u03C0.").messages
+<ul class="errorlist"><li>Not π.</li></ul>
+
+# Can take a lazy string.
+>>> print ValidationError(ugettext_lazy("Error.")).messages
+<ul class="errorlist"><li>Error.</li></ul>
+
+# Can take a list.
+>>> print ValidationError(["Error one.", "Error two."]).messages
+<ul class="errorlist"><li>Error one.</li><li>Error two.</li></ul>
+
+# Can take a mixture in a list.
+>>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages
+<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul>
+
+>>> class VeryBadError:
+...     def __unicode__(self): return u"A very bad error."
+
+# Can take a non-string.
+>>> print ValidationError(VeryBadError()).messages
+<ul class="errorlist"><li>A very bad error.</li></ul>
+"""
+

a/tests/regressiontests/forms/error_messages.py

@@ -36 +36 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('4')
-Traceback (most recent call last):
-...
@@ -60 +60 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('4')
-Traceback (most recent call last):
-...
@@ -88 +88 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('4')
-Traceback (most recent call last):
-...
@@ -122 +122 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# TimeField ###################################################################
-
@@ -136 +136 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# DateTimeField ###############################################################
-
@@ -150 +150 @@
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# RegexField ##################################################################
-
@@ -204 +204 @@
-
->>> e = {'required': 'REQUIRED'}
->>> e['invalid'] = 'INVALID'
->>> e['missing'] = 'MISSING'
->>> e['empty'] = 'EMPTY FILE'
->>> f = FileField(error_messages=e)
->>> f.clean('')
-Traceback (most recent call last):
-...
-REQUIRE
+INVALI
->>> f.clean('abc')
-Traceback (most recent call last):
-...
-ValidationError: [u'INVALID']
-SimpleUploadedFile('name', None)
+{}
-Traceback (most recent call last):
-...
-EMPTY FILE
-SimpleUploadedFile('name', '')
+INVALID
+{'filename': 'name', 'content':''}
-Traceback (most recent call last):
-...
-ValidationError: [u'EMPTY FILE']
@@ -279 +278 @@
->>> f.clean('b')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(['b'])
-Traceback (most recent call last):
-...
@@ -353 +352 @@
->>> f.clean('3')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(['4'])
-Traceback (most recent call last):
-...

a/tests/regressiontests/forms/extra.py

@@ -424 +424 @@
-# Test overriding ErrorList in a form #
-#######################################
-
-newforms.util
+core.validation
->>> class DivErrorList(ErrorList):
-...     def __unicode__(self):
-...         return self.as_divs()

a/tests/regressiontests/forms/fields.py

@@ -32 +32 @@
-             field name, if the Field is part of a Form.
-    initial -- A value to use in this Field's initial display. This value is
-               *not* used as a fallback if data isn't given.
+    validators -- Optional list of additional validator functions
-
-Other than that, the Field subclasses have class-specific options for
-__init__(). For example, CharField has a max_length option.
@@ -104 +105 @@
->>> f.clean('1234567890a')
-u'1234567890a'
-
+# Custom validator functions ##################################################
+
+>>> def validator(value, error_dict={}): raise ValidationError('validator failed')
+>>> f = CharField(min_length=10, validators=[validator])
+>>> f.clean('aa')
+Traceback (most recent call last):
+...
+ValidationError: [u'validator failed']
+
+>>> def validator2(value, error_dict={}): raise ValidationError('validator2 failed')
+>>> f = CharField(min_length=10, validators=[validator, validator, validator2])
+>>> f.clean('aa')
+Traceback (most recent call last):
+...
+ValidationError: [u'validator failed', u'validator failed', u'validator2 failed']
+
+>>> class MyCharField(CharField):
+...     validators = [validator]
+>>> f = MyCharField()
+>>> f.clean('aa')
+Traceback (most recent call last):
+...
+ValidationError: [u'validator failed']
+
-# IntegerField ################################################################
-
->>> f = IntegerField()
@@ -124 +149 @@
->>> f.clean('a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(42)
-42
->>> f.clean(3.14)
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('1 ')
-1
->>> f.clean(' 1')
@@ -140 +165 @@
->>> f.clean('1a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
->>> f = IntegerField(required=False)
->>> f.clean('')
@@ -158 +183 @@
->>> f.clean('a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('1 ')
-1
->>> f.clean(' 1')
@@ -168 +193 @@
->>> f.clean('1a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-IntegerField accepts an optional max_value parameter:
->>> f = IntegerField(max_value=10)
@@ -261 +286 @@
->>> f.clean('a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('1.0 ')
-1.0
->>> f.clean(' 1.0')
@@ -271 +296 @@
->>> f.clean('1.0a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
->>> f = FloatField(required=False)
->>> f.clean('')
@@ -323 +348 @@
->>> f.clean('a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(u'łąść')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('1.0 ')
-Decimal("1.0")
->>> f.clean(' 1.0')
@@ -337 +362 @@
->>> f.clean('1.0a')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('123.45')
-Traceback (most recent call last):
-...
@@ -373 +398 @@
->>> f.clean('--0.12')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
->>> f = DecimalField(max_digits=4, decimal_places=2, required=False)
->>> f.clean('')
@@ -434 +459 @@
->>> f.clean('2006-4-31')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('200a-10-25')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('25/10/06')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(None)
-Traceback (most recent call last):
-...
@@ -470 +495 @@
->>> f.clean('2006-10-25')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('10/25/2006')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('10/25/06')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# TimeField ###################################################################
-
@@ -495 +520 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('1:24 p.m.')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-TimeField accepts an optional input_formats parameter:
->>> f = TimeField(input_formats=['%I:%M %p'])
@@ -517 +542 @@
->>> f.clean('14:30:45')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-# DateTimeField ###############################################################
-
@@ -558 +583 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('2006-10-25 4:30 p.m.')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-DateField accepts an optional input_formats parameter:
->>> f = DateTimeField(input_formats=['%Y %m %d %I:%M %p'])
@@ -582 +607 @@
->>> f.clean('2006-10-25 14:30:45')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
->>> f = DateTimeField(required=False)
->>> f.clean(None)
@@ -748 +773 @@
->>> f.clean('')
-Traceback (most recent call last):
-...
-This field is required
+No file was submitted. Check the encoding type on the form
-
->>> f.clean('', '')
-Traceback (most recent call last):
-...
-This field is required
+No file was submitted. Check the encoding type on the form
-
->>> f.clean('', 'files/test1.pdf')
-'files/test1.pdf'
@@ -761 +786 @@
->>> f.clean(None)
-Traceback (most recent call last):
-...
-This field is required
+No file was submitted. Check the encoding type on the form
-
->>> f.clean(None, '')
-Traceback (most recent call last):
-...
-This field is required
+No file was submitted. Check the encoding type on the form
-
->>> f.clean(None, 'files/test2.pdf')
-'files/test2.pdf'
@@ -1000 +1025 @@
-
->>> f = ChoiceField(choices=[('1', '1'), ('2', '2')], required=False)
->>> f.clean('')
-u''
->>> f.clean(None)
-u''
->>> f.clean(1)
-u'1'
->>> f.clean('1')
@@ -1058 +1081 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean([])
-Traceback (most recent call last):
-...
@@ -1090 +1113 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean([])
-[]
->>> f.clean(())
@@ -1193 +1216 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(['hello', 'there'])
-Traceback (most recent call last):
-...
@@ -1219 +1242 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(['hello', 'there'])
-Traceback (most recent call last):
-...

a/tests/regressiontests/forms/forms.py

@@ -1464 +1464 @@
-
->>> f = FileForm(data={}, files={}, auto_id=False)
->>> print f
-This field is required
+No file was submitted. Check the encoding type on the form
-
->>> f = FileForm(data={}, files={'file1': SimpleUploadedFile('name', '')}, auto_id=False)
->>> print f

a/tests/regressiontests/forms/localflavor/br.py

@@ -85 +85 @@
-...
-ValidationError: [u'Invalid CNPJ number.']
->>> f.clean('64.132.916/0001-88')
-
+u
->>> f.clean('64-132-916/0001-88')
-
+u
->>> f.clean('64132916/0001-88')
-
+u
->>> f.clean('64.132.916/0001-XX')
-Traceback (most recent call last):
-...

a/tests/regressiontests/forms/localflavor/generic.py

@@ -38 +38 @@
->>> f.clean('2006-4-31')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('200a-10-25')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('10/25/06')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean(None)
-Traceback (most recent call last):
-...
@@ -74 +74 @@
->>> f.clean('2006-10-25')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('25/10/2006')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('25/10/06')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-## Generic DateTimeField ######################################################
-
@@ -126 +126 @@
->>> f.clean('hello')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
->>> f.clean('2006-10-25 4:30 p.m.')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
-DateField accepts an optional input_formats parameter:
->>> f = DateTimeField(input_formats=['%Y %m %d %I:%M %p'])
@@ -150 +150 @@
->>> f.clean('2006-10-25 14:30:45')
-Traceback (most recent call last):
-...
-Validat
+TypeCoerc
-
->>> f = DateTimeField(required=False)
->>> f.clean(None)

a/tests/regressiontests/forms/util.py

@@ -5 +5 @@
-
-tests = r"""
->>> from django.newforms.util import *
->>> from django.utils.translation import ugettext_lazy
-
-###########
-# flatatt #
@@ -18 +17 @@
-u' class="news" title="Read this"'
->>> flatatt({})
-u''
-
-###################
-# ValidationError #
-###################
-
-# Can take a string.
->>> print ValidationError("There was an error.").messages
-<ul class="errorlist"><li>There was an error.</li></ul>
-
-# Can take a unicode string.
->>> print ValidationError(u"Not \u03C0.").messages
-<ul class="errorlist"><li>Not π.</li></ul>
-
-# Can take a lazy string.
->>> print ValidationError(ugettext_lazy("Error.")).messages
-<ul class="errorlist"><li>Error.</li></ul>
-
-# Can take a list.
->>> print ValidationError(["Error one.", "Error two."]).messages
-<ul class="errorlist"><li>Error one.</li><li>Error two.</li></ul>
-
-# Can take a mixture in a list.
->>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages
-<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul>
-
->>> class VeryBadError:
-...     def __unicode__(self): return u"A very bad error."
-
-# Can take a non-string.
->>> print ValidationError(VeryBadError()).messages
-<ul class="errorlist"><li>A very bad error.</li></ul>
-"""