Ticket #2101: max_length.5.diff

django/utils/maxlength.py

@@ +1 @@
+"""
+Utilities for providing backwards compatibility for the maxlength argument,
+which has been replaced by max_length, see ticket #2101.
+"""
+
+from warnings import warn
+
+def get_maxlength(self):
+    return self.max_length
+
+def set_maxlength(self, value):
+    self.max_length = value
+
+def legacy_maxlength(max_length, maxlength):
+    """
+    Consolidates max_length and maxlength, providing backwards compatibilty
+    for the legacy "maxlength" argument.
+    If one of max_length or maxlength is given, then that value is returned.
+    If both are given, a TypeError is raised.
+    If maxlength is used at all, a deprecation warning is issued.
+    """
+    if maxlength is not None:
+        warn("maxlength is deprecated, use max_length instead.",
+             PendingDeprecationWarning,
+             stacklevel=3)
+        if max_length is not None:
+            raise TypeError("field can not take both the max_length"
+                            " argument and the legacy maxlength argument.")
+        max_length = maxlength
+    return max_length
+
+def remove_maxlength(func):
+    """
+    A decorator to be used on a class's __init__ that provides backwards
+    compatibilty for the legacy "maxlength" keyword argument, i.e.
+      name = models.CharField(maxlength=20)
+    It does this by changing the passed "maxlength" keyword argument
+    (if it exists) into a "max_length" keyword argument.
+    """
+    def inner(self, *args, **kwargs):
+        max_length = kwargs.get('max_length', None)
+        # pop maxlength because we don't want this going to __init__.
+        maxlength = kwargs.pop('maxlength', None)
+        max_length = legacy_maxlength(max_length, maxlength)
+        # Only set the max_length keyword argument if we got a value back.
+        if max_length is not None:
+            kwargs['max_length'] = max_length
+        func(self, *args, **kwargs)
+    return inner
+
+# This metaclass is used in two places, and should be removed when legacy
+# support for maxlength is dropped.
+#   * oldforms.FormField
+#   * db.models.fields.Field
+
+class LegacyMaxlength(type):
+    """
+    Metaclass for providing backwards compatibility support for the
+    "maxlength" keyword argument.
+    """
+    
+    def __init__(cls, name, bases, attrs):
+        super(LegacyMaxlength, cls).__init__(name, bases, attrs)
+        # Decorate the class's __init__ to remove any maxlength keyword.
+        cls.__init__ = remove_maxlength(cls.__init__)
+        # Support accessing and setting to the legacy maxlength attribute.
+        cls.maxlength = property(get_maxlength, set_maxlength)

tests/regressiontests/maxlength/tests.py

@@ +1 @@
+# Test access to max_length while still providing full backwards compatibility
+# with legacy maxlength attribute.
+"""
+
+Don't print out the deprecation warnings during testing.
+>>> from warnings import filterwarnings
+>>> filterwarnings("ignore")
+
+# legacy_maxlength function
+
+>>> from django.utils.maxlength import legacy_maxlength
+
+>>> legacy_maxlength(None, None)
+
+
+>>> legacy_maxlength(10, None)
+10
+
+>>> legacy_maxlength(None, 10)
+10
+
+>>> legacy_maxlength(10, 12)
+Traceback (most recent call last):
+...
+TypeError: field can not take both the max_length argument and the legacy maxlength argument.
+
+>>> legacy_maxlength(0, 10)
+Traceback (most recent call last):
+...
+TypeError: field can not take both the max_length argument and the legacy maxlength argument.
+
+>>> legacy_maxlength(0, None)
+0
+
+>>> legacy_maxlength(None, 0)
+0
+
+#===============================================================================
+# Fields
+#===============================================================================
+
+# Set up fields
+>>> from django.db.models import fields
+>>> new = fields.Field(max_length=15)
+>>> old = fields.Field(maxlength=10)
+
+# Ensure both max_length and legacy maxlength are not able to both be specified
+>>> fields.Field(maxlength=10, max_length=15)
+Traceback (most recent call last):
+    ...
+TypeError: field can not take both the max_length argument and the legacy maxlength argument.
+
+# Test max_length
+>>> new.max_length
+15
+>>> old.max_length
+10
+
+# Test accessing maxlength
+>>> new.maxlength
+15
+>>> old.maxlength
+10
+
+# Test setting maxlength
+>>> new.maxlength += 1
+>>> old.maxlength += 1
+>>> new.max_length
+16
+>>> old.max_length
+11
+
+# SlugField __init__ passes through max_length so test that too
+>>> fields.SlugField('new', max_length=15).max_length
+15
+>>> fields.SlugField('empty').max_length
+50
+>>> fields.SlugField('old', maxlength=10).max_length
+10
+
+#===============================================================================
+# (old)forms
+#===============================================================================
+
+>>> from django import oldforms
+
+# Test max_length attribute
+
+>>> oldforms.TextField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vTextField" name="new" size="30" value="" maxlength="15" />'
+
+>>> oldforms.IntegerField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vIntegerField" name="new" size="10" value="" maxlength="15" />'
+
+>>> oldforms.SmallIntegerField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vSmallIntegerField" name="new" size="5" value="" maxlength="15" />'
+
+>>> oldforms.PositiveIntegerField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vPositiveIntegerField" name="new" size="10" value="" maxlength="15" />'
+
+>>> oldforms.PositiveSmallIntegerField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vPositiveSmallIntegerField" name="new" size="5" value="" maxlength="15" />'
+
+>>> oldforms.DatetimeField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vDatetimeField" name="new" size="30" value="" maxlength="15" />'
+
+>>> oldforms.EmailField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vEmailField" name="new" size="50" value="" maxlength="15" />'
+>>> oldforms.EmailField('new').render('')
+u'<input type="text" id="id_new" class="vEmailField" name="new" size="50" value="" maxlength="75" />'
+
+>>> oldforms.URLField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vURLField" name="new" size="50" value="" maxlength="15" />'
+>>> oldforms.URLField('new').render('')
+u'<input type="text" id="id_new" class="vURLField" name="new" size="50" value="" maxlength="200" />'
+
+>>> oldforms.IPAddressField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vIPAddressField" name="new" size="15" value="" maxlength="15" />'
+>>> oldforms.IPAddressField('new').render('')
+u'<input type="text" id="id_new" class="vIPAddressField" name="new" size="15" value="" maxlength="15" />'
+
+>>> oldforms.CommaSeparatedIntegerField('new', max_length=15).render('')
+u'<input type="text" id="id_new" class="vCommaSeparatedIntegerField" name="new" size="20" value="" maxlength="15" />'
+
+
+# Test legacy maxlength attribute
+
+>>> oldforms.TextField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vTextField" name="old" size="30" value="" maxlength="10" />'
+
+>>> oldforms.IntegerField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vIntegerField" name="old" size="10" value="" maxlength="10" />'
+
+>>> oldforms.SmallIntegerField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vSmallIntegerField" name="old" size="5" value="" maxlength="10" />'
+
+>>> oldforms.PositiveIntegerField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vPositiveIntegerField" name="old" size="10" value="" maxlength="10" />'
+
+>>> oldforms.PositiveSmallIntegerField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vPositiveSmallIntegerField" name="old" size="5" value="" maxlength="10" />'
+
+>>> oldforms.DatetimeField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vDatetimeField" name="old" size="30" value="" maxlength="10" />'
+
+>>> oldforms.EmailField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vEmailField" name="old" size="50" value="" maxlength="10" />'
+
+>>> oldforms.URLField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vURLField" name="old" size="50" value="" maxlength="10" />'
+
+>>> oldforms.IPAddressField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vIPAddressField" name="old" size="15" value="" maxlength="10" />'
+
+>>> oldforms.CommaSeparatedIntegerField('old', maxlength=10).render('')
+u'<input type="text" id="id_old" class="vCommaSeparatedIntegerField" name="old" size="20" value="" maxlength="10" />'
+"""
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()

django/contrib/admin/models.py

@@ -18 +18 @@
-    user = models.ForeignKey(User)
-    content_type = models.ForeignKey(ContentType, blank=True, null=True)
-    object_id = models.TextField(_('object id'), blank=True, null=True)
-
+_
-    action_flag = models.PositiveSmallIntegerField(_('action flag'))
-    change_message = models.TextField(_('change message'), blank=True)
-    objects = LogEntryManager()

django/contrib/admin/templatetags/admin_modify.py

@@ -192 +192 @@
-            t.append(u'document.getElementById("id_%s").onkeyup = function() {' \
-                     ' var e = document.getElementById("id_%s");' \
-                     ' if(!e._changed) { e.value = URLify(%s, %s);} }; ' % (
-
+_
-    return u''.join(t)
-auto_populated_field_script = register.simple_tag(auto_populated_field_script)
-

django/contrib/admin/views/doc.py

@@ -291 +291 @@
-DATA_TYPE_MAPPING = {
-    'AutoField'                 : _('Integer'),
-    'BooleanField'              : _('Boolean (Either True or False)'),
-
+_
-    'CommaSeparatedIntegerField': _('Comma-separated integers'),
-    'DateField'                 : _('Date (without time)'),
-    'DateTimeField'             : _('Date (with time)'),
@@ -310 +310 @@
-    'PhoneNumberField'          : _('Phone number'),
-    'PositiveIntegerField'      : _('Integer'),
-    'PositiveSmallIntegerField' : _('Integer'),
-
+_
-    'SmallIntegerField'         : _('Integer'),
-    'TextField'                 : _('Text'),
-    'TimeField'                 : _('Time'),

django/contrib/auth/forms.py

@@ -10 +10 @@
-    "A form that creates a user, with no privileges, from the given username and password."
-    def __init__(self):
-        self.fields = (
-
+_
-                validator_list=[validators.isAlphaNumeric, self.isValidUsername]),
-
-
+_
+_
-                validator_list=[validators.AlwaysMatchesOtherField('password1', _("The two password fields didn't match."))]),
-        )
-
@@ -42 +42 @@
-        """
-        self.request = request
-        self.fields = [
-
+_
-                validator_list=[self.isValidUser, self.hasCookiesEnabled]),
-
+_
-        ]
-        self.user_cache = None
-
@@ -111 +111 @@
-    def __init__(self, user):
-        self.user = user
-        self.fields = (
-
+_
-                validator_list=[self.isValidOldPassword]),
-
+_
-                validator_list=[validators.AlwaysMatchesOtherField('new_password2', _("The two 'new password' fields didn't match."))]),
-
+_
-        )
-
-    def isValidOldPassword(self, new_data, all_data):
@@ -133 +133 @@
-    def __init__(self, user):
-        self.user = user
-        self.fields = (
-
-
+_
+_
-                validator_list=[validators.AlwaysMatchesOtherField('password1', _("The two password fields didn't match."))]),
-        )
-

django/contrib/auth/models.py

@@ -50 +50 @@
-
-    Three basic permissions -- add, change and delete -- are automatically created for each Django model.
-    """
-
+_
-    content_type = models.ForeignKey(ContentType)
-
+_
-
-    class Meta:
-        verbose_name = _('permission')
@@ -70 +70 @@
-
-    Beyond permissions, groups are a convenient way to categorize users to apply some label, or extended functionality, to them. For example, you could create a group 'Special users', and you could write code that would do special things to those users -- such as giving them access to a members-only portion of your site, or sending them members-only e-mail messages.
-    """
-
+_
-    permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True, filter_interface=models.HORIZONTAL)
-
-    class Meta:
@@ -108 +108 @@
-
-    Username and password are required. Other fields are optional.
-    """
-
-
-
+_
+_
+_
-    email = models.EmailField(_('e-mail address'), blank=True)
-
+_
-    is_staff = models.BooleanField(_('staff status'), default=False, help_text=_("Designates whether the user can log into this admin site."))
-    is_active = models.BooleanField(_('active'), default=True, help_text=_("Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."))
-    is_superuser = models.BooleanField(_('superuser status'), default=False, help_text=_("Designates that this user has all permissions without explicitly assigning them."))

django/contrib/comments/models.py

@@ -65 +65 @@
-    user = models.ForeignKey(User, raw_id_admin=True)
-    content_type = models.ForeignKey(ContentType)
-    object_id = models.IntegerField(_('object ID'))
-
-
+_
+_
-    rating1 = models.PositiveSmallIntegerField(_('rating #1'), blank=True, null=True)
-    rating2 = models.PositiveSmallIntegerField(_('rating #2'), blank=True, null=True)
-    rating3 = models.PositiveSmallIntegerField(_('rating #3'), blank=True, null=True)
@@ -164 +164 @@
-    # A FreeComment is a comment by a non-registered user.
-    content_type = models.ForeignKey(ContentType)
-    object_id = models.IntegerField(_('object ID'))
-
-
+_
+_
-    submit_date = models.DateTimeField(_('date/time submitted'), auto_now_add=True)
-    is_public = models.BooleanField(_('is public'))
-    ip_address = models.IPAddressField(_('ip address'))

django/contrib/comments/views/comments.py

@@ -29 +29 @@
-            else:
-                return []
-        self.fields.extend([
-
+_
-                validator_list=[self.hasNoProfanities]),
-            oldforms.RadioSelectField(field_name="rating1", choices=choices,
-                is_required=ratings_required and num_rating_choices > 0,
@@ -122 +122 @@
-    "Manipulator that handles public free (unregistered) comments"
-    def __init__(self):
-        self.fields = (
-
+_
-                validator_list=[self.hasNoProfanities]),
-
+_
-                validator_list=[self.hasNoProfanities]),
-        )
-

django/contrib/contenttypes/models.py

@@ -32 +32 @@
-        CONTENT_TYPE_CACHE = {}
-
-class ContentType(models.Model):
-
-
-
+_
+_
+_
-    objects = ContentTypeManager()
-    class Meta:
-        verbose_name = _('content type')

django/contrib/flatpages/models.py

@@ -4 +4 @@
-from django.utils.translation import ugettext_lazy as _
-
-class FlatPage(models.Model):
-
+_
-        help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
-
+_
-    content = models.TextField(_('content'))
-    enable_comments = models.BooleanField(_('enable comments'))
-
+_
-        help_text=_("Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."))
-    registration_required = models.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page."))
-    sites = models.ManyToManyField(Site)

django/contrib/redirects/models.py

@@ -4 +4 @@
-
-class Redirect(models.Model):
-    site = models.ForeignKey(Site, radio_admin=models.VERTICAL)
-
+_
-        help_text=_("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))
-
+_
-        help_text=_("This can be either an absolute path (as above) or a full URL starting with 'http://'."))
-
-    class Meta:

django/contrib/sessions/models.py

@@ -65 +65 @@
-    the sessions documentation that is shipped with Django (also available
-    on the Django website).
-    """
-
+_
-    session_data = models.TextField(_('session data'))
-    expire_date = models.DateTimeField(_('expire date'))
-    objects = SessionManager()

django/contrib/sites/models.py

@@ -12 +12 @@
-        return self.get(pk=sid)
-
-class Site(models.Model):
-
-
+_
+_
-    objects = SiteManager()
-    class Meta:
-        db_table = 'django_site'

django/core/management.py

@@ -910 +910 @@
-                    field_type, new_params = field_type
-                    extra_params.update(new_params)
-
-
+_
-                if field_type == 'CharField' and row[3]:
-
+_
-
-                if field_type == 'DecimalField':
-                    extra_params['max_digits'] = row[4]
@@ -987 +987 @@
-        for f in opts.fields:
-            if f.name == 'id' and not f.primary_key and opts.pk.name == 'id':
-                e.add(opts, '"%s": You can\'t use "id" as a field name, because each model automatically gets an "id" field if none of the fields have primary_key=True. You need to either remove/rename your "id" field or add primary_key=True to a field.' % f.name)
-
-
+_
+_
-            if isinstance(f, models.DecimalField):
-                if f.decimal_places is None:
-                    e.add(opts, '"%s": DecimalFields require a "decimal_places" attribute.' % f.name)
@@ -1013 +1013 @@
-            if f.db_index not in (None, True, False):
-                e.add(opts, '"%s": "db_index" should be either None, True or False.' % f.name)
-
-
+_
-            if settings.DATABASE_ENGINE == 'mysql':
-                db_version = connection.get_server_version()
-
-
+_
+_
-
-            # Check to see if the related field will clash with any
-            # existing fields, m2m fields, m2m related objects or related objects
@@ -1252 +1252 @@
-    from django.db import backend, connection, transaction, models
-    fields = (
-        # "key" is a reserved word in MySQL, so use "cache_key" instead.
-
+_
-        models.TextField(name='value'),
-        models.DateTimeField(name='expires', db_index=True),
-    )

django/db/backends/ado_mssql/creation.py

@@ -1 +1 @@
-DATA_TYPES = {
-    'AutoField':         'int IDENTITY (1, 1)',
-    'BooleanField':      'bit',
-
-
+_
+_
-    'DateField':         'smalldatetime',
-    'DateTimeField':     'smalldatetime',
-    'DecimalField':      'numeric(%(max_digits)s, %(decimal_places)s)',
@@ -17 +17 @@
-    'PhoneNumberField':  'varchar(20)',
-    'PositiveIntegerField': 'int CONSTRAINT [CK_int_pos_%(column)s] CHECK ([%(column)s] > 0)',
-    'PositiveSmallIntegerField': 'smallint CONSTRAINT [CK_smallint_pos_%(column)s] CHECK ([%(column)s] > 0)',
-
+_
-    'SmallIntegerField': 'smallint',
-    'TextField':         'text',
-    'TimeField':         'time',

django/db/backends/mysql/creation.py

@@ -5 +5 @@
-DATA_TYPES = {
-    'AutoField':         'integer AUTO_INCREMENT',
-    'BooleanField':      'bool',
-
-
+_
+_
-    'DateField':         'date',
-    'DateTimeField':     'datetime',
-    'DecimalField':      'numeric(%(max_digits)s, %(decimal_places)s)',
@@ -21 +21 @@
-    'PhoneNumberField':  'varchar(20)',
-    'PositiveIntegerField': 'integer UNSIGNED',
-    'PositiveSmallIntegerField': 'smallint UNSIGNED',
-
+_
-    'SmallIntegerField': 'smallint',
-    'TextField':         'longtext',
-    'TimeField':         'time',

django/db/backends/mysql_old/creation.py

@@ -5 +5 @@
-DATA_TYPES = {
-    'AutoField':         'integer AUTO_INCREMENT',
-    'BooleanField':      'bool',
-
-
+_
+_
-    'DateField':         'date',
-    'DateTimeField':     'datetime',
-    'DecimalField':      'numeric(%(max_digits)s, %(decimal_places)s)',
@@ -21 +21 @@
-    'PhoneNumberField':  'varchar(20)',
-    'PositiveIntegerField': 'integer UNSIGNED',
-    'PositiveSmallIntegerField': 'smallint UNSIGNED',
-
+_
-    'SmallIntegerField': 'smallint',
-    'TextField':         'longtext',
-    'TimeField':         'time',

django/db/backends/oracle/creation.py

@@ -8 +8 @@
-DATA_TYPES = {
-    'AutoField':                    'NUMBER(11)',
-    'BooleanField':                 'NUMBER(1) CHECK (%(column)s IN (0,1))',
-
-
+_
+_
-    'DateField':                    'DATE',
-    'DateTimeField':                'TIMESTAMP',
-    'DecimalField':                 'NUMBER(%(max_digits)s, %(decimal_places)s)',

django/db/backends/postgresql/creation.py

@@ -5 +5 @@
-DATA_TYPES = {
-    'AutoField':         'serial',
-    'BooleanField':      'boolean',
-
-
+_
+_
-    'DateField':         'date',
-    'DateTimeField':     'timestamp with time zone',
-    'DecimalField':      'numeric(%(max_digits)s, %(decimal_places)s)',
@@ -21 +21 @@
-    'PhoneNumberField':  'varchar(20)',
-    'PositiveIntegerField': 'integer CHECK ("%(column)s" >= 0)',
-    'PositiveSmallIntegerField': 'smallint CHECK ("%(column)s" >= 0)',
-
+_
-    'SmallIntegerField': 'smallint',
-    'TextField':         'text',
-    'TimeField':         'time',

django/db/backends/sqlite3/creation.py

@@ -4 +4 @@
-DATA_TYPES = {
-    'AutoField':                    'integer',
-    'BooleanField':                 'bool',
-
-
+_
+_
-    'DateField':                    'date',
-    'DateTimeField':                'datetime',
-    'DecimalField':                 'decimal',
@@ -20 +20 @@
-    'PhoneNumberField':             'varchar(20)',
-    'PositiveIntegerField':         'integer unsigned',
-    'PositiveSmallIntegerField':    'smallint unsigned',
-
+_
-    'SmallIntegerField':            'smallint',
-    'TextField':                    'text',
-    'TimeField':                    'time',

django/db/backends/sqlite3/introspection.py

@@ -81 +81 @@
-            import re
-            m = re.search(r'^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$', key)
-            if m:
-
+_
-            raise KeyError
-
-DATA_TYPES_REVERSE = FlexibleFieldLookupDict()

django/db/models/fields/__init__.py

@@ -11 +11 @@
-from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy, ugettext as _
-from django.utils.encoding import smart_unicode, force_unicode, smart_str
+from django.utils.maxlength import LegacyMaxlength
-import datetime, os, time
-try:
-    import decimal
@@ -63 +64 @@
-#     getattr(obj, opts.pk.attname)
-
-class Field(object):
-
+
+
+
+
-    # Designates whether empty strings fundamentally are allowed at the
-    # database level.
-    empty_strings_allowed = True
@@ -72 +76 @@
-    creation_counter = 0
-
-    def __init__(self, verbose_name=None, name=None, primary_key=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,
@@ -80 +84 @@
-        self.name = name
-        self.verbose_name = verbose_name
-        self.primary_key = primary_key
-length, self.unique = max
+_length, self.unique = max_
-        self.blank, self.null = blank, null
-        # Oracle treats the empty string ('') as null, so coerce the null
-        # option whenever '' is a possible value.
@@ -244 +248 @@
-
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-        params = {'validator_list': self.validator_list[:]}
-length and not self.choices: # Don't give SelectFields a max
-length'] = self.max
+_length and not self.choices: # Don't give SelectFields a max_
+_length'] = self.max_
-
-        if self.choices:
-            if self.radio_admin:
@@ -461 +465 @@
-        return smart_unicode(value)
-
-    def formfield(self, **kwargs):
-
+_
-        defaults.update(kwargs)
-        return super(CharField, self).formfield(**defaults)
-
@@ -670 +674 @@
-
-class EmailField(CharField):
-    def __init__(self, *args, **kwargs):
-
+_
-        CharField.__init__(self, *args, **kwargs)
-
-    def get_internal_type(self):
@@ -829 +833 @@
-class IPAddressField(Field):
-    empty_strings_allowed = False
-    def __init__(self, *args, **kwargs):
-
+_
-        Field.__init__(self, *args, **kwargs)
-
-    def get_manipulator_field_objs(self):
@@ -877 +881 @@
-
-class SlugField(Field):
-    def __init__(self, *args, **kwargs):
-length'] = kwargs.get('max
+_length'] = kwargs.get('max_
-        kwargs.setdefault('validator_list', []).append(validators.isSlug)
-        # Set db_index=True unless it's been set manually.
-        if 'db_index' not in kwargs:
@@ -963 +967 @@
-
-class URLField(CharField):
-    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
-length'] = kwargs.get('max
+_length'] = kwargs.get('max_
-        if verify_exists:
-            kwargs.setdefault('validator_list', []).append(validators.isExistingURL)
-        self.verify_exists = verify_exists

django/newforms/fields.py

@@ -120 +120 @@
-
-    def widget_attrs(self, widget):
-        if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
+            # The HTML attribute is maxlength, not max_length.
-            return {'maxlength': str(self.max_length)}
-
-class IntegerField(Field):

django/oldforms/__init__.py

@@ -4 +4 @@
-from django.conf import settings
-from django.utils.translation import ugettext, ungettext
-from django.utils.encoding import smart_unicode, force_unicode
+from django.utils.maxlength import LegacyMaxlength
-
-FORM_FIELD_ID_PREFIX = 'id_'
-
@@ -302 +303 @@
-    Subclasses should also implement a render(data) method, which is responsible
-    for rending the form field in XHTML.
-    """
+    # Provide backwards compatibility for the maxlength attribute and
+    # argument for this class and all subclasses.
+    __metaclass__ = LegacyMaxlength
-
-    def __str__(self):
-        return unicode(self).encode('utf-8')
@@ -390 +394 @@
-
-class TextField(FormField):
-    input_type = "text"
-
+_
-        if validator_list is None: validator_list = []
-        self.field_name = field_name
-length = length, max
+_length = length, max_
-        self.is_required = is_required
-        self.validator_list = [self.isValidLength, self.hasNoNewlines] + validator_list
-        if member_name != None:
-            self.member_name = member_name
-
-    def isValidLength(self, data, form):
-length and len(smart_unicode(data)) > self.max
+_length and len(smart_unicode(data)) > self.max_
-            raise validators.ValidationError, ungettext("Ensure your text is less than %s character.",
-length) % self.max
+_length) % self.max_
-
-    def hasNoNewlines(self, data, form):
-        if data and '\n' in data:
@@ -411 +415 @@
-    def render(self, data):
-        if data is None:
-            data = u''
-
-
-length = u'maxlength="%s" ' % self.max
+_
+_
+_length = u'maxlength="%s" ' % self.max_
-        return u'<input type="%s" id="%s" class="v%s%s" name="%s" size="%s" value="%s" %s/>' % \
-            (self.input_type, self.get_id(), self.__class__.__name__, self.is_required and u' required' or '',
-
+_
-
-    def html2python(data):
-        return data
@@ -426 +430 @@
-    input_type = "password"
-
-class LargeTextField(TextField):
-
+_
-        if validator_list is None: validator_list = []
-        self.field_name = field_name
-        self.rows, self.cols, self.is_required = rows, cols, is_required
-        self.validator_list = validator_list[:]
-
+_
-            self.validator_list.append(self.isValidLength)
-length = max
+_length = max_
-
-    def render(self, data):
-        if data is None:
@@ -710 +714 @@
-####################
-
-class IntegerField(TextField):
-
+_
-        if validator_list is None: validator_list = []
-        validator_list = [self.isInteger] + validator_list
-        if member_name is not None:
-            self.member_name = member_name
-
+_