Ticket #2101: max_length.3.diff

django/utils/maxlength.py

@@ +1 @@
+"""
+Methods and functions for legacy maxlength support.
+"""
+
+def get_maxlength(self):
+    return self.max_length
+
+def set_maxlength(self, value):
+    self.max_length = value
+
+def legacy_maxlength(max_length, maxlength, default=None):
+    """
+    Provides backwards compatibilty for the legacy "maxlength" attribute.
+    If one of max_length or maxlength is given, then that value is returned.
+    If both are given, a TypeError is raised.
+    If neither are given, the default value or None is returned depending on
+    if a default value was given or not.
+    """
+    if max_length is not None and maxlength is not None: 
+        raise TypeError("field can not take both the max_length argument and"
+                        " the legacy maxlength argument.")
+    for value in [max_length, maxlength, default]:
+        if value is not None:
+            return value
+
+def legacy_maxlength_kwargs(kwargs, default=None):
+    """
+    Similar to legacy_maxlength, but operates on a dictionary with max_length
+    and maxlength keys.  The resulting maximum length is stored using the key
+    "max_length", and the "maxlength" key is removed it if exists.
+    """
+    kwargs['max_length'] = legacy_maxlength(kwargs.get('max_length', None),
+                                            kwargs.get('maxlength', None),
+                                            default)
+    if 'maxlength' in kwargs:
+        del kwargs['maxlength']
+    return kwargs

tests/regressiontests/maxlength/tests.py

@@ +1 @@
+# Test access to max_length while still providing full backwards compatibility
+# with legacy maxlength attribute.
+"""
+# legacy_maxlength
+
+>>> from django.oldforms 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(None, None, 50)
+50
+
+>>> legacy_maxlength(10, None, 50)
+10
+
+>>> legacy_maxlength(None, 10, 50)
+10
+
+>>> legacy_maxlength(10, 12, 50)
+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, 10)
+0
+
+>>> legacy_maxlength(None, 0, 10)
+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 get_maxlength, set_maxlength, legacy_maxlength, legacy_maxlength_kwargs 
-import datetime, os, time
-try:
-    import decimal
@@ -72 +73 @@
-    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,
-
+, maxlength=None
-        self.name = name
-        self.verbose_name = verbose_name
-        self.primary_key = primary_key
-
+
+
+
+
+
-        self.blank, self.null = blank, null
-        # Oracle treats the empty string ('') as null, so coerce the null
-        # option whenever '' is a possible value.
@@ -106 +111 @@
-        self.creation_counter = Field.creation_counter
-        Field.creation_counter += 1
-
+    # Support accessing and setting to the legacy maxlength argument.
+    maxlength = property(get_maxlength, set_maxlength)
+
-    def __cmp__(self, other):
-        # This is needed because bisect does not take a comparison function.
-        return cmp(self.creation_counter, other.creation_counter)
@@ -244 +252 @@
-
-    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 +469 @@
-        return smart_unicode(value)
-
-    def formfield(self, **kwargs):
-
+_
-        defaults.update(kwargs)
-        return super(CharField, self).formfield(**defaults)
-
@@ -670 +678 @@
-
-class EmailField(CharField):
-    def __init__(self, *args, **kwargs):
-
+
+
-        CharField.__init__(self, *args, **kwargs)
-
-    def get_internal_type(self):
@@ -829 +838 @@
-class IPAddressField(Field):
-    empty_strings_allowed = False
-    def __init__(self, *args, **kwargs):
-
+
+
-        Field.__init__(self, *args, **kwargs)
-
-    def get_manipulator_field_objs(self):
@@ -877 +887 @@
-
-class SlugField(Field):
-    def __init__(self, *args, **kwargs):
-['maxlength'] = kwargs.get('maxlength', 
+ = legacy_maxlength_kwargs(kwargs, default=
-        kwargs.setdefault('validator_list', []).append(validators.isSlug)
-        # Set db_index=True unless it's been set manually.
-        if 'db_index' not in kwargs:
@@ -963 +973 @@
-
-class URLField(CharField):
-    def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
-['maxlength'] = kwargs.get('maxlength', 
+ = legacy_maxlength_kwargs(kwargs, default=
-        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 get_maxlength, set_maxlength, legacy_maxlength, legacy_maxlength_kwargs
-
-FORM_FIELD_ID_PREFIX = 'id_'
-
@@ -390 +391 @@
-
-class TextField(FormField):
-    input_type = "text"
-
+
+
+
-        if validator_list is None: validator_list = []
-        self.field_name = field_name
-
+
+
+
+
-        self.is_required = is_required
-        self.validator_list = [self.isValidLength, self.hasNoNewlines] + validator_list
-        if member_name != None:
-            self.member_name = member_name
-
+    # Support accessing and setting the legacy maxlength argument.
+    maxlength = property(get_maxlength, set_maxlength)
+
-    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 +420 @@
-    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 +435 @@
-    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 +721 @@
-####################
-
-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
-
+_
-
-    def isInteger(self, field_data, all_data):
-        try:
@@ -730 +744 @@
-    html2python = staticmethod(html2python)
-
-class SmallIntegerField(IntegerField):
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isSmallInteger] + validator_list
-
+_
-
-    def isSmallInteger(self, field_data, all_data):
-        if not -32768 <= int(field_data) <= 32767:
-            raise validators.CriticalValidationError, ugettext("Enter a whole number between -32,768 and 32,767.")
-
-class PositiveIntegerField(IntegerField):
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isPositive] + validator_list
-
+_
-
-    def isPositive(self, field_data, all_data):
-        if int(field_data) < 0:
-            raise validators.CriticalValidationError, ugettext("Enter a positive number.")
-
-class PositiveSmallIntegerField(IntegerField):
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isPositiveSmall] + validator_list
-
+_
-
-    def isPositiveSmall(self, field_data, all_data):
-        if not 0 <= int(field_data) <= 32767:
@@ -806 +826 @@
-class DatetimeField(TextField):
-    """A FormField that automatically converts its data to a datetime.datetime object.
-    The data should be in the format YYYY-MM-DD HH:MM:SS."""
-
+
+
+
-        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 = [validators.isValidANSIDatetime] + validator_list
-
@@ -836 +858 @@
-    def __init__(self, field_name, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidDate] + validator_list
-
+_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidDate(self, field_data, all_data):
@@ -861 +883 @@
-    def __init__(self, field_name, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidTime] + validator_list
-
+_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidTime(self, field_data, all_data):
@@ -893 +915 @@
-
-class EmailField(TextField):
-    "A convenience FormField for validating e-mail addresses"
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidEmail] + validator_list
-length=max
+_length=max_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidEmail(self, field_data, all_data):
@@ -907 +931 @@
-
-class URLField(TextField):
-    "A convenience FormField for validating URLs"
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidURL] + validator_list
-length=max
+_length=max_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidURL(self, field_data, all_data):
@@ -920 +946 @@
-            raise validators.CriticalValidationError, e.messages
-
-class IPAddressField(TextField):
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidIPAddress] + validator_list
-length=max
+_length=max_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidIPAddress(self, field_data, all_data):
@@ -970 +998 @@
-    def __init__(self, field_name, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidPhone] + validator_list
-
+_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidPhone(self, field_data, all_data):
@@ -984 +1012 @@
-    def __init__(self, field_name, is_required=False, validator_list=None):
-        if validator_list is None: validator_list = []
-        validator_list = [self.isValidUSState] + validator_list
-
+_
-            is_required=is_required, validator_list=validator_list)
-
-    def isValidUSState(self, field_data, all_data):
@@ -1001 +1029 @@
-
-class CommaSeparatedIntegerField(TextField):
-    "A convenience FormField for validating comma-separated integer fields"
-
+
+
+
-        if validator_list is None: validator_list = []
-        validator_list = [self.isCommaSeparatedIntegerList] + validator_list
-length=max
+_length=max_
-            is_required=is_required, validator_list=validator_list)
-
-    def isCommaSeparatedIntegerList(self, field_data, all_data):

docs/contributing.txt

@@ -340 +340 @@
-      Do this::
-
-          class Person(models.Model):
-
-
+_
+_
-
-      Don't do this::
-
-          class Person(models.Model):
-
-
+_
+_
-
-    * The ``class Meta`` should appear *after* the fields are defined, with
-      a single blank line separating the fields and the class definition.
@@ -355 +355 @@
-      Do this::
-
-          class Person(models.Model):
-
-
+_
+_
-
-              class Meta:
-                  verbose_name_plural = 'people'
@@ -364 +364 @@
-      Don't do this::
-
-          class Person(models.Model):
-
-
+_
+_
-              class Meta:
-                  verbose_name_plural = 'people'
-
@@ -375 +375 @@
-              class Meta:
-                  verbose_name_plural = 'people'
-
-
-
+_
+_
-
-    * The order of model inner classes and standard methods should be as
-      follows (noting that these are not all required):

docs/db-api.txt

@@ -12 +12 @@
-a weblog application::
-
-    class Blog(models.Model):
-
+_
-        tagline = models.TextField()
-
-        def __unicode__(self):
-            return self.name
-
-    class Author(models.Model):
-
+_
-        email = models.URLField()
-
-        def __unicode__(self):
@@ -27 +27 @@
-
-    class Entry(models.Model):
-        blog = models.ForeignKey(Blog)
-
+_
-        body_text = models.TextField()
-        pub_date = models.DateTimeField()
-        authors = models.ManyToManyField(Author)
@@ -1806 +1806 @@
-        ('F', 'Female'),
-    )
-    class Person(models.Model):
-
-
+_
+_
-
-...each ``Person`` instance will have a ``get_gender_display()`` method. Example::
-

docs/forms.txt

@@ -37 +37 @@
-    )
-
-    class Place(models.Model):
-
-
-
+_
+_
+_
-        state = models.USStateField()
-
+_
-        place_type = models.IntegerField(choices=PLACE_TYPES)
-
-        class Admin:
@@ -388 +388 @@
-        def __init__(self):
-            self.fields = (
-                forms.EmailField(field_name="from", is_required=True),
-
+_
-                forms.SelectField(field_name="urgency", choices=urgency_choices),
-                forms.LargeTextField(field_name="contents", is_required=True),
-            )

docs/model-api.txt

@@ -33 +33 @@
-    from django.db import models
-
-    class Person(models.Model):
-
-
+_
+_
-
-``first_name`` and ``last_name`` are *fields* of the model. Each field is
-specified as a class attribute, and each attribute maps to a database column.
@@ -69 +69 @@
-Example::
-
-    class Musician(models.Model):
-
-
-
+_
+_
+_
-
-    class Album(models.Model):
-        artist = models.ForeignKey(Musician)
-
+_
-        release_date = models.DateField()
-        num_stars = models.IntegerField()
-
@@ -142 +142 @@
-
-The admin represents this as an ``<input type="text">`` (a single-line input).
-
-
-
+_
+_
-and in Django's validation.
-
-
+
+
+
+
+
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+_
-argument is required.
-
-``DateField``
@@ -217 +221 @@
-~~~~~~~~~~~~~~
-
-A ``CharField`` that checks that the value is a valid e-mail address.
-length``; its ``max
+_length``; its ``max_
-75.
-
-``FileField``
@@ -400 +404 @@
-containing only letters, numbers, underscores or hyphens. They're generally
-used in URLs.
-
-length``. If ``max
+_length``. If ``max_
-not specified, Django will use a default length of 50.
-
-Implies ``db_index=True``.
@@ -447 +451 @@
-
-The admin represents this as an ``<input type="text">`` (a single-line input).
-
-
-
-
+_
+imum 
+_
-is used.
-
-``USStateField``
@@ -536 +540 @@
-            ('M', 'Male'),
-            ('F', 'Female'),
-        )
-
+_
-
-or outside your model class altogether::
-
@@ -545 +549 @@
-        ('F', 'Female'),
-    )
-    class Foo(models.Model):
-
+_
-
-For each model field that has ``choices`` set, Django will add a method to
-retrieve the human-readable name for the field's current value. See
@@ -698 +702 @@
-
-In this example, the verbose name is ``"Person's first name"``::
-
-
+_
-
-In this example, the verbose name is ``"first name"``::
-
-
+_
-
-``ForeignKey``, ``ManyToManyField`` and ``OneToOneField`` require the first
-argument to be a model class, so use the ``verbose_name`` keyword argument::
@@ -1027 +1031 @@
-``Field`` type::
-
-    class Person(models.Model):
-
-
+_
+_
-        something_else = MytypeField()
-
-If you aim to build a database-agnostic application, you should account for
@@ -1074 +1078 @@
-
-    # This is a much more flexible example.
-    class BetterCharField(models.Field):
-
-length = max
+_
+_length = max_
-            super(BetterCharField, self).__init__(*args, **kwargs)
-
-        def db_type(self):
-
+_
-
-    # In the model:
-    class MyModel(models.Model):
@@ -1096 +1100 @@
-Give your model metadata by using an inner ``class Meta``, like so::
-
-    class Foo(models.Model):
-
+_
-
-        class Meta:
-            # ...
@@ -1270 +1274 @@
-inner ``"class Admin"``, like so::
-
-    class Person(models.Model):
-
-
+_
+_
-
-        class Admin:
-            # Admin options go here
@@ -1430 +1434 @@
-      Here's a full example model::
-
-          class Person(models.Model):
-
+_
-              birthday = models.DateField()
-
-              class Admin:
@@ -1447 +1451 @@
-      Here's a full example model::
-
-          class Person(models.Model):
-
-
-
+_
+_
+_
-
-              class Admin:
-                  list_display = ('first_name', 'last_name', 'colored_name')
@@ -1465 +1469 @@
-      Here's a full example model::
-
-          class Person(models.Model):
-
+_
-              birthday = models.DateField()
-
-              class Admin:
@@ -1493 +1497 @@
-      For example::
-
-        class Person(models.Model):
-
-
+_
+_
-
-            class Admin:
-                list_display = ('first_name', 'colored_first_name')
@@ -1744 +1748 @@
-            return result_list
-
-    class OpinionPoll(models.Model):
-
+_
-        poll_date = models.DateField()
-        objects = PollManager()
-
-    class Response(models.Model):
-        poll = models.ForeignKey(Poll)
-
+_
-        response = models.TextField()
-
-With this example, you'd use ``OpinionPoll.objects.with_counts()`` to return
@@ -1766 +1770 @@
-example, using this model::
-
-    class Book(models.Model):
-
-
+_
+_
-
-...the statement ``Book.objects.all()`` will return all books in the database.
-
@@ -1785 +1789 @@
-
-    # Then hook it into the Book model explicitly.
-    class Book(models.Model):
-
-
+_
+_
-
-        objects = models.Manager() # The default manager.
-        dahl_objects = DahlBookManager() # The Dahl-specific manager.
@@ -1819 +1823 @@
-            return super(FemaleManager, self).get_query_set().filter(sex='F')
-
-    class Person(models.Model):
-
-
-
+_
+_
+_
-        people = models.Manager()
-        men = MaleManager()
-        women = FemaleManager()
@@ -1851 +1855 @@
-For example, this model has a few custom methods::
-
-    class Person(models.Model):
-
-
+_
+_
-        birth_date = models.DateField()
-
-
+_
+_
-        state = models.USStateField() # Yes, this is America-centric...
-
-        def baby_boomer_status(self):
@@ -1897 +1901 @@
-For example::
-
-    class Person(models.Model):
-
-
+_
+_
-
-        def __str__(self):
-            # Note use of django.utils.encoding.smart_str() here because
@@ -1915 +1919 @@
-more simply as::
-
-    class Person(models.Model):
-
-
+_
+_
-
-        def __unicode__(self):
-            return u'%s %s' % (self.first_name, self.last_name)
@@ -2056 +2060 @@
-to happen whenever you save an object. For example::
-
-    class Blog(models.Model):
-
+_
-        tagline = models.TextField()
-
-        def save(self):
@@ -2067 +2071 @@
-You can also prevent saving::
-
-    class Blog(models.Model):
-
+_
-        tagline = models.TextField()
-
-        def save(self):

docs/newforms.txt

@@ -1372 +1372 @@
-    ``AutoField``                    Not represented in the form
-    ``BooleanField``                 ``BooleanField``
-    ``CharField``                    ``CharField`` with ``max_length`` set to
-
+_
-    ``CommaSeparatedIntegerField``   ``CharField``
-    ``DateField``                    ``DateField``
-    ``DateTimeField``                ``DateTimeField``
@@ -1452 +1452 @@
-    )
-
-    class Author(models.Model):
-
-
+_
+_
-        birth_date = models.DateField(blank=True, null=True)
-
-        def __unicode__(self):
-            return self.name
-
-    class Book(models.Model):
-
+_
-        authors = models.ManyToManyField(Author)
-
-With these models, a call to ``form_for_model(Author)`` would return a ``Form``

docs/overview.txt

@@ -25 +25 @@
-quick example::
-
-    class Reporter(models.Model):
-
+_
-
-        def __unicode__(self):
-            return self.full_name
-
-    class Article(models.Model):
-        pub_date = models.DateTimeField()
-
+_
-        article = models.TextField()
-        reporter = models.ForeignKey(Reporter)
-
@@ -134 +134 @@
-
-    class Article(models.Model):
-        pub_date = models.DateTimeField()
-
+_
-        article = models.TextField()
-        reporter = models.ForeignKey(Reporter)
-        class Admin: pass

docs/sites.txt

@@ -46 +46 @@
-    from django.contrib.sites.models import Site
-
-    class Article(models.Model):
-
+_
-        # ...
-        sites = models.ManyToManyField(Site)
-
@@ -87 +87 @@
-    from django.contrib.sites.models import Site
-
-    class Article(models.Model):
-
+_
-        # ...
-        site = models.ForeignKey(Site)
-
@@ -229 +229 @@
-
-    class Photo(models.Model):
-        photo = models.FileField(upload_to='/home/photos')
-
+_
-        pub_date = models.DateField()
-        site = models.ForeignKey(Site)
-        objects = models.Manager()
@@ -257 +257 @@
-
-    class Photo(models.Model):
-        photo = models.FileField(upload_to='/home/photos')
-
+_
-        pub_date = models.DateField()
-        publish_on = models.ForeignKey(Site)
-        objects = models.Manager()

docs/testing.txt

@@ -79 +79 @@
-        'The cat says "meow"'
-        """
-
-
-
+_
+_
-
-        def speak(self):
-            return 'The %s says "%s"' % (self.name, self.sound)

docs/tutorial01.txt

@@ -251 +251 @@
-    from django.db import models
-
-    class Poll(models.Model):
-
+_
-        pub_date = models.DateTimeField('date published')
-
-    class Choice(models.Model):
-        poll = models.ForeignKey(Poll)
-
+_
-        votes = models.IntegerField()
-
-The code is straightforward. Each model is represented by a class that
@@ -279 +279 @@
-machine-readable name will suffice as its human-readable name.
-
-Some ``Field`` classes have required elements. ``CharField``, for example,
-
+_
-schema, but in validation, as we'll soon see.
-
-Finally, note a relationship is defined, using ``models.ForeignKey``. That tells

docs/tutorial02.txt

@@ -240 +240 @@
-
-Then change the other fields in ``Choice`` to give them ``core=True``::
-
-
+_
-    votes = models.IntegerField(core=True)
-
-This tells Django: "When you edit a Choice on the Poll admin page, the 'choice'

tests/modeltests/basic/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    class Meta:

tests/modeltests/choices/models.py

@@ -17 +17 @@
-)
-
-class Person(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return self.name

tests/modeltests/custom_columns/models.py

@@ -18 +18 @@
-from django.db import models
-
-class Author(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u'%s %s' % (self.first_name, self.last_name)
@@ -29 +29 @@
-        ordering = ('last_name','first_name')
-
-class Article(models.Model):
-
+_
-    authors = models.ManyToManyField(Author, db_table='my_m2m_table')
-
-    def __unicode__(self):

tests/modeltests/custom_managers/models.py

@@ -18 +18 @@
-        return self.filter(fun=True)
-
-class Person(models.Model):
-
-
+_
+_
-    fun = models.BooleanField()
-    objects = PersonManager()
-
@@ -33 +33 @@
-        return super(PublishedBookManager, self).get_query_set().filter(is_published=True)
-
-class Book(models.Model):
-
-
+_
+_
-    is_published = models.BooleanField()
-    published_objects = PublishedBookManager()
-    authors = models.ManyToManyField(Person, related_name='books')
@@ -49 +49 @@
-        return super(FastCarManager, self).get_query_set().filter(top_speed__gt=150)
-
-class Car(models.Model):
-
+_
-    mileage = models.IntegerField()
-    top_speed = models.IntegerField(help_text="In miles per hour.")
-    cars = models.Manager()

tests/modeltests/custom_methods/models.py

@@ -8 +8 @@
-import datetime
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateField()
-
-    def __unicode__(self):

tests/modeltests/custom_pk/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Employee(models.Model):
-
+_
-            db_column = 'code')
-
-
+_
+_
-    class Meta:
-        ordering = ('last_name', 'first_name')
-
@@ -19 +19 @@
-        return u"%s %s" % (self.first_name, self.last_name)
-
-class Business(models.Model):
-
+_
-    employees = models.ManyToManyField(Employee)
-    class Meta:
-        verbose_name_plural = 'businesses'

tests/modeltests/field_defaults/models.py

@@ -13 +13 @@
-from datetime import datetime
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField(default=datetime.now)
-
-    def __unicode__(self):

tests/modeltests/fixtures/models.py

@@ -11 +11 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    def __unicode__(self):

tests/modeltests/generic_relations/models.py

@@ -28 +28 @@
-        return self.tag
-
-class Animal(models.Model):
-
-
+_
+_
-    
-    tags = generic.GenericRelation(TaggedItem)
-
@@ -37 +37 @@
-        return self.common_name
-        
-class Vegetable(models.Model):
-
+_
-    is_yucky = models.BooleanField(default=True)
-    
-    tags = generic.GenericRelation(TaggedItem)
@@ -46 +46 @@
-        return self.name
-    
-class Mineral(models.Model):
-
+_
-    hardness = models.PositiveSmallIntegerField()
-    
-    # note the lack of an explicit GenericRelation here...

tests/modeltests/get_latest/models.py

@@ -11 +11 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateField()
-    expire_date = models.DateField()
-    class Meta:
@@ -21 +21 @@
-        return self.headline
-
-class Person(models.Model):
-
+_
-    birthday = models.DateField()
-
-    # Note that this model doesn't have "get_latest_by" set.

tests/modeltests/get_object_or_404/models.py

@@ -15 +15 @@
-from django.shortcuts import get_object_or_404, get_list_or_404
-
-class Author(models.Model):
-
+_
-    
-    def __unicode__(self):
-        return self.name
@@ -26 +26 @@
-
-class Article(models.Model):
-    authors = models.ManyToManyField(Author)
-
+_
-    objects = models.Manager()
-    by_a_sir = ArticleManager()
-    

tests/modeltests/get_or_create/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Person(models.Model):
-
-
+_
+_
-    birthday = models.DateField()
-
-    def __unicode__(self):

tests/modeltests/invalid_models/models.py

@@ -10 +10 @@
-    charfield = models.CharField()
-    decimalfield = models.DecimalField()
-    filefield = models.FileField()
-
-
-
-
+_
+_
+_
+_
-
-class Target(models.Model):
-
-
-
+_
+_
+_
-
-
+_
-
-class Clash1(models.Model):
-
+_
-
-    foreign = models.ForeignKey(Target)
-    m2m = models.ManyToManyField(Target)
-
-class Clash2(models.Model):
-
+_
-
-    foreign_1 = models.ForeignKey(Target, related_name='id')
-    foreign_2 = models.ForeignKey(Target, related_name='src_safe')
@@ -38 +38 @@
-    m2m_2 = models.ManyToManyField(Target, related_name='src_safe')
-
-class Target2(models.Model):
-
+_
-    foreign_tgt = models.ForeignKey(Target)
-    clashforeign_set = models.ForeignKey(Target)
-
@@ -46 +46 @@
-    clashm2m_set = models.ManyToManyField(Target)
-
-class Clash3(models.Model):
-
+_
-    
-    foreign_1 = models.ForeignKey(Target2, related_name='foreign_tgt')
-    foreign_2 = models.ForeignKey(Target2, related_name='m2m_tgt')
@@ -61 +61 @@
-    m2m = models.ManyToManyField(Target2)
-
-class SelfClashForeign(models.Model):
-
-
+_
+_
-
-    selfclashforeign_set = models.ForeignKey("SelfClashForeign")
-    foreign_1 = models.ForeignKey("SelfClashForeign", related_name='id')
-    foreign_2 = models.ForeignKey("SelfClashForeign", related_name='src_safe')
-
-class ValidM2M(models.Model):
-
-
+_
+_
-
-    # M2M fields are symmetrical by default. Symmetrical M2M fields
-    # on self don't require a related accessor, so many potential
@@ -84 +84 @@
-    m2m_4 = models.ManyToManyField('self')
-
-class SelfClashM2M(models.Model):
-
-
+_
+_
-
-    # Non-symmetrical M2M fields _do_ have related accessors, so
-    # there is potential for clashes.
@@ -100 +100 @@
-class Model(models.Model):
-    "But it's valid to call a model Model."
-    year = models.PositiveIntegerField() #1960
-
-
+_
+_
-
-class Car(models.Model):
-
+_
-    model = models.ForeignKey(Model)
-
-
+_
-invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute.
-invalid_models.fielderrors: "decimalfield": DecimalFields require a "max_digits" attribute.
-invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.

tests/modeltests/lookup/models.py

@@ -8 +8 @@
-from django.conf import settings
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-    class Meta:
-        ordering = ('-pub_date', 'headline')

tests/modeltests/m2m_and_m2o/models.py

@@ -7 +7 @@
-from django.db import models
-
-class User(models.Model):
-
+_
-
-class Issue(models.Model):
-    num = models.IntegerField()

tests/modeltests/m2m_intermediary/models.py

@@ -13 +13 @@
-from django.db import models
-
-class Reporter(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s %s" % (self.first_name, self.last_name)
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateField()
-
-    def __unicode__(self):
@@ -29 +29 @@
-class Writer(models.Model):
-    reporter = models.ForeignKey(Reporter)
-    article = models.ForeignKey(Article)
-
+_
-
-    def __unicode__(self):
-        return u'%s (%s)' % (self.reporter, self.position)

tests/modeltests/m2m_multiple/models.py

@@ -10 +10 @@
-from django.db import models
-
-class Category(models.Model):
-
+_
-    class Meta:
-       ordering = ('name',)
-
@@ -18 +18 @@
-        return self.name
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-    primary_categories = models.ManyToManyField(Category, related_name='primary_article_set')
-    secondary_categories = models.ManyToManyField(Category, related_name='secondary_article_set')

tests/modeltests/m2m_recursive/models.py

@@ -15 +15 @@
-from django.db import models
-
-class Person(models.Model):
-
+_
-    friends = models.ManyToManyField('self')
-    idols = models.ManyToManyField('self', symmetrical=False, related_name='stalkers')
-

tests/modeltests/m2o_recursive/models.py

@@ -13 +13 @@
-from django.db import models
-
-class Category(models.Model):
-
+_
-    parent = models.ForeignKey('self', null=True, related_name='child_set')
-
-    def __unicode__(self):

tests/modeltests/m2o_recursive2/models.py

@@ -10 +10 @@
-from django.db import models
-
-class Person(models.Model):
-
+_
-    mother = models.ForeignKey('self', null=True, related_name='mothers_child_set')
-    father = models.ForeignKey('self', null=True, related_name='fathers_child_set')
-

tests/modeltests/manipulators/models.py

@@ -7 +7 @@
-from django.db import models
-
-class Musician(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s %s" % (self.first_name, self.last_name)
-
-class Album(models.Model):
-
+_
-    musician = models.ForeignKey(Musician)
-    release_date = models.DateField(blank=True, null=True)
-

tests/modeltests/many_to_many/models.py

@@ -10 +10 @@
-from django.db import models
-
-class Publication(models.Model):
-
+_
-
-    def __unicode__(self):
-        return self.title
@@ -19 +19 @@
-        ordering = ('title',)
-
-class Article(models.Model):
-
+_
-    publications = models.ManyToManyField(Publication)
-
-    def __unicode__(self):

tests/modeltests/many_to_one/models.py

@@ -7 +7 @@
-from django.db import models
-
-class Reporter(models.Model):
-
-
+_
+_
-    email = models.EmailField()
-
-    def __unicode__(self):
-        return u"%s %s" % (self.first_name, self.last_name)
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateField()
-    reporter = models.ForeignKey(Reporter)
-

tests/modeltests/many_to_one_null/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Reporter(models.Model):
-
+_
-
-    def __unicode__(self):
-        return self.name
-
-class Article(models.Model):
-
+_
-    reporter = models.ForeignKey(Reporter, null=True)
-
-    class Meta:

tests/modeltests/model_forms/models.py

@@ -31 +31 @@
-)
-
-class Category(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return self.name
-
-class Writer(models.Model):
-
+_
-
-    def __unicode__(self):
-        return self.name
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateField()
-    created = models.DateField(editable=False)
-    writer = models.ForeignKey(Writer)
@@ -63 +63 @@
-
-class PhoneNumber(models.Model):
-    phone = models.PhoneNumberField()
-
+_
-
-    def __unicode__(self):
-        return self.phone

tests/modeltests/model_inheritance/models.py

@@ -7 +7 @@
-from django.db import models
-
-class Place(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s the place" % self.name

tests/modeltests/mutually_referential/models.py

@@ -7 +7 @@
-from django.db.models import *
-
-class Parent(Model):
-
+_
-    bestchild = ForeignKey("Child", null=True, related_name="favoured_by")
-
-class Child(Model):
-
+_
-    parent = ForeignKey(Parent)
-
-__test__ = {'API_TESTS':"""

tests/modeltests/one_to_one/models.py

@@ -9 +9 @@
-from django.db import models
-
-class Place(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s the place" % self.name
@@ -25 +25 @@
-
-class Waiter(models.Model):
-    restaurant = models.ForeignKey(Restaurant)
-
+_
-
-    def __unicode__(self):
-        return u"%s the waiter at %s" % (self.name, self.restaurant)
-
-class ManualPrimaryKey(models.Model):
-
-
+_
+_
-
-class RelatedModel(models.Model):
-    link = models.OneToOneField(ManualPrimaryKey)
-
+_
-
-__test__ = {'API_TESTS':"""
-# Create a couple of Places.

tests/modeltests/or_lookups/models.py

@@ -14 +14 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    class Meta:

tests/modeltests/ordering/models.py

@@ -16 +16 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-    class Meta:
-        ordering = ('-pub_date', 'headline')

tests/modeltests/pagination/models.py

@@ -9 +9 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    def __unicode__(self):

tests/modeltests/properties/models.py

@@ -7 +7 @@
-from django.db import models
-
-class Person(models.Model):
-
-
+_
+_
-
-    def _get_full_name(self):
-        return "%s %s" % (self.first_name, self.last_name)

tests/modeltests/reserved_names/models.py

@@ -10 +10 @@
-from django.db import models
-
-class Thing(models.Model):
-
-
-
-
-
-
-
-
+_
+_
+_
+_
+_
+_
+_
+_
-    class Meta:
-       db_table = 'select'
-

tests/modeltests/reverse_lookup/models.py

@@ -7 +7 @@
-from django.db import models
-
-class User(models.Model):
-
+_
-
-    def __unicode__(self):
-        return self.name
-
-class Poll(models.Model):
-
+_
-    creator = models.ForeignKey(User)
-
-    def __unicode__(self):
-        return self.question
-
-class Choice(models.Model):
-
+_
-    poll = models.ForeignKey(Poll, related_name="poll_choice")
-    related_poll = models.ForeignKey(Poll, related_name="related_choice")
-

tests/modeltests/save_delete_hooks/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Person(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s %s" % (self.first_name, self.last_name)

tests/modeltests/select_related/models.py

@@ -12 +12 @@
-# Who remembers high school biology?
-
-class Domain(models.Model):
-
+_
-    def __unicode__(self):
-        return self.name
-
-class Kingdom(models.Model):
-
+_
-    domain = models.ForeignKey(Domain)
-    def __unicode__(self):
-        return self.name
-
-class Phylum(models.Model):
-
+_
-    kingdom = models.ForeignKey(Kingdom)
-    def __unicode__(self):
-        return self.name
-    
-class Klass(models.Model):
-
+_
-    phylum = models.ForeignKey(Phylum)
-    def __unicode__(self):
-        return self.name
-    
-class Order(models.Model):
-
+_
-    klass = models.ForeignKey(Klass)
-    def __unicode__(self):
-        return self.name
-
-class Family(models.Model):
-
+_
-    order = models.ForeignKey(Order)
-    def __unicode__(self):
-        return self.name
-
-class Genus(models.Model):
-
+_
-    family = models.ForeignKey(Family)
-    def __unicode__(self):
-        return self.name
-
-class Species(models.Model):
-
+_
-    genus = models.ForeignKey(Genus)
-    def __unicode__(self):
-        return self.name

tests/modeltests/serializers/models.py

@@ -8 +8 @@
-from django.db import models
-
-class Category(models.Model):
-
+_
-
-    class Meta:
-       ordering = ('name',)
@@ -17 +17 @@
-        return self.name
-
-class Author(models.Model):
-
+_
-
-    class Meta:
-        ordering = ('name',)
@@ -27 +27 @@
-
-class Article(models.Model):
-    author = models.ForeignKey(Author)
-
+_
-    pub_date = models.DateTimeField()
-    categories = models.ManyToManyField(Category)
-

tests/modeltests/str/models.py

@@ -17 +17 @@
-from django.db import models
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    def __str__(self):
@@ -26 +26 @@
-        return self.headline
-
-class InternationalArticle(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-
-    def __unicode__(self):

tests/modeltests/transactions/models.py

@@ -10 +10 @@
-from django.db import models
-
-class Reporter(models.Model):
-
-
+_
+_
-    email = models.EmailField()
-
-    def __unicode__(self):

tests/modeltests/validation/models.py

@@ -12 +12 @@
-
-class Person(models.Model):
-    is_child = models.BooleanField()
-
+_
-    birthdate = models.DateField()
-    favorite_moment = models.DateTimeField()
-    email = models.EmailField()

tests/regressiontests/bug639/models.py

@@ -2 +2 @@
-from django.db import models
-
-class Photo(models.Model):
-
+_
-    image = models.FileField(upload_to=tempfile.gettempdir())
-    
-    # Support code for the tests; this keeps track of how many times save() gets

tests/regressiontests/datatypes/models.py

@@ -7 +7 @@
-from django.conf import settings
-
-class Donut(models.Model):
-
+_
-    is_frosted = models.BooleanField(default=False)
-    has_sprinkles = models.NullBooleanField()
-    baked_date = models.DateField(null=True)

tests/regressiontests/fixtures_regress/models.py

@@ -2 +2 @@
-from django.contrib.auth.models import User
-
-class Animal(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return self.common_name
-
-class Plant(models.Model):
-
+_
-
-    class Meta:
-        # For testing when upper case letter in app name; regression for #4057
-        db_table = "Fixtures_regress_plant"
-
-class Stuff(models.Model):
-
+_
-    owner = models.ForeignKey(User, null=True)
-    
-    def __unicode__(self):

tests/regressiontests/initial_sql_regress/models.py

@@ -5 +5 @@
-from django.db import models
-
-class Simple(models.Model):
-
+_
-
-__test__ = {'API_TESTS':""}
-

tests/regressiontests/invalid_admin_options/models.py

@@ -12 +12 @@
-##This should fail gracefully but is causing a metaclass error
-#class BadAdminOption(models.Model):
-#    "Test nonexistent admin option"
-
+_
-#    
-#    class Admin:
-#        nonexistent = 'option'
@@ -22 +22 @@
-        
-class ListDisplayBadOne(models.Model):
-    "Test list_display, list_display must be a list or tuple"
-
+_
-
-    class Admin:
-        list_display = 'first_name'
@@ -32 +32 @@
-
-class ListDisplayBadTwo(models.Model):
-    "Test list_display, list_display items must be attributes, methods or properties."
-
+_
-
-    class Admin:
-        list_display = ['first_name','nonexistent']
@@ -41 +41 @@
-"""        
-class ListDisplayBadThree(models.Model):
-    "Test list_display, list_display items can not be a ManyToManyField."
-
+_
-    nick_names = models.ManyToManyField('ListDisplayGood')
-
-    class Admin:
@@ -52 +52 @@
-      
-class ListDisplayGood(models.Model):
-    "Test list_display, Admin list_display can be a attribute, method or property."
-
+_
-    
-    def _last_name(self):
-        return self.first_name
@@ -66 +66 @@
-       
-class ListDisplayLinksBadOne(models.Model):
-    "Test list_display_links, item must be included in list_display."
-
-
+_
+_
-    
-    class Admin:
-        list_display = ['last_name']
@@ -78 +78 @@
-
-class ListDisplayLinksBadTwo(models.Model):
-    "Test list_display_links, must be a list or tuple."
-
-
+_
+_
-    
-    class Admin:
-        list_display = ['first_name','last_name']
@@ -92 +92 @@
-## This is failing but the validation which should fail is not.
-#class ListDisplayLinksBadThree(models.Model):
-#    "Test list_display_links, must define list_display to use list_display_links."
-
-
+_
+_
-#    
-#    class Admin:
-#        list_display_links = ('first_name',)
@@ -103 +103 @@
-        
-class ListDisplayLinksGood(models.Model):
-    "Test list_display_links, Admin list_display_list can be a attribute, method or property."
-
+_
-    
-    def _last_name(self):
-        return self.first_name
@@ -118 +118 @@
-
-class ListFilterBadOne(models.Model):
-    "Test list_filter, must be a list or tuple."
-
+_
-    
-    class Admin:
-        list_filter = 'first_name'     
@@ -128 +128 @@
-
-class ListFilterBadTwo(models.Model):
-    "Test list_filter, must be a field not a property or method."
-
+_
-    
-    def _last_name(self):
-        return self.first_name
@@ -146 +146 @@
-
-class DateHierarchyBadOne(models.Model):
-    "Test date_hierarchy, must be a date or datetime field."
-
+_
-    birth_day = models.DateField()
-    
-    class Admin:
@@ -158 +158 @@
-
-class DateHierarchyBadTwo(models.Model):
-    "Test date_hieracrhy, must be a field."
-
+_
-    birth_day = models.DateField()
-    
-    class Admin:
@@ -169 +169 @@
-
-class DateHierarchyGood(models.Model):
-    "Test date_hieracrhy, must be a field."
-
+_
-    birth_day = models.DateField()
-    
-    class Admin:
@@ -177 +177 @@
-      
-class SearchFieldsBadOne(models.Model):
-    "Test search_fields, must be a list or tuple."
-
+_
-    
-    class Admin:
-        search_fields = ('nonexistent')         
@@ -188 +188 @@
-      
-class SearchFieldsBadTwo(models.Model):
-    "Test search_fields, must be a field."
-
+_
-
-    def _last_name(self):
-        return self.first_name
@@ -203 +203 @@
-
-class SearchFieldsGood(models.Model):
-    "Test search_fields, must be a list or tuple."
-
-
+_
+_
-    
-    class Admin:
-        search_fields = ['first_name','last_name']
@@ -212 +212 @@
-
-class JsBadOne(models.Model):
-    "Test js, must be a list or tuple"
-
+_
-    
-    class Admin:
-        js = 'test.js'
@@ -223 +223 @@
-
-class SaveAsBad(models.Model):
-    "Test save_as, should be True or False"
-
+_
-    
-    class Admin:
-        save_as = 'not True or False'
@@ -234 +234 @@
-
-class SaveOnTopBad(models.Model):
-    "Test save_on_top, should be True or False"
-
+_
-    
-    class Admin:
-        save_on_top = 'not True or False'
@@ -245 +245 @@
-
-class ListSelectRelatedBad(models.Model):
-    "Test list_select_related, should be True or False"
-
+_
-    
-    class Admin:
-        list_select_related = 'not True or False'
@@ -256 +256 @@
-
-class ListPerPageBad(models.Model):
-    "Test list_per_page, should be a positive integer value."
-
+_
-    
-    class Admin:
-        list_per_page = 89.3
@@ -267 +267 @@
-
-class FieldsBadOne(models.Model):
-    "Test fields, should be a tuple"
-
-
+_
+_
-    
-    class Admin:
-        fields = 'not a tuple'
@@ -279 +279 @@
-
-class FieldsBadTwo(models.Model):
-    """Test fields, 'fields' dict option is required."""
-
-
+_
+_
-    
-    class Admin:
-        fields = ('Name', {'description': 'this fieldset needs fields'})
@@ -291 +291 @@
-
-class FieldsBadThree(models.Model):
-    """Test fields, 'classes' and 'description' are the only allowable extra dict options."""
-
-
+_
+_
-    
-    class Admin:
-        fields = ('Name', {'fields': ('first_name','last_name'),'badoption': 'verybadoption'})
@@ -303 +303 @@
-
-class FieldsGood(models.Model):
-    "Test fields, working example"
-
-
+_
+_
-    birth_day = models.DateField()
-    
-    class Admin:
@@ -315 +315 @@
-                  
-class OrderingBad(models.Model):
-    "Test ordering, must be a field."
-
-
+_
+_
-    
-    class Admin:
-        ordering = 'nonexistent'
@@ -328 +328 @@
-## TODO: Add a manager validator, this should fail gracefully.
-#class ManagerBad(models.Model):
-#    "Test manager, must be a manager object."
-
+_
-#    
-#    class Admin:
-#        manager = 'nonexistent'

tests/regressiontests/many_to_one_regress/models.py

@@ -12 +12 @@
-
-# Protect against repetition of #1839, #2415 and #2536.
-class Third(models.Model):
-
+_
-    third = models.ForeignKey('self', null=True, related_name='child_set')
-
-class Parent(models.Model):
-
+_
-    bestchild = models.ForeignKey('Child', null=True, related_name='favored_by')
-
-class Child(models.Model):
-
+_
-    parent = models.ForeignKey(Parent)
-
-

tests/regressiontests/model_regress/models.py

@@ -7 +7 @@
-)
-
-class Article(models.Model):
-
+_
-    pub_date = models.DateTimeField()
-    status = models.IntegerField(blank=True, null=True, choices=CHOICES)
-

tests/regressiontests/null_queries/models.py

@@ -1 +1 @@
-from django.db import models
-
-class Poll(models.Model):
-
+_
-
-    def __unicode__(self):
-        return u"Q: %s " % self.question
-
-class Choice(models.Model):
-    poll = models.ForeignKey(Poll)
-
+_
-
-    def __unicode__(self):
-        return u"Choice: %s in poll %s" % (self.choice, self.poll)

tests/regressiontests/one_to_one_regress/models.py

@@ -1 +1 @@
-from django.db import models
-
-class Place(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return u"%s the place" % self.name
@@ -16 +16 @@
-        return u"%s the restaurant" % self.place.name
-
-class Favorites(models.Model):
-
+_
-    restaurants = models.ManyToManyField(Restaurant)
-
-    def __unicode__(self):

tests/regressiontests/serializers_regress/models.py

@@ -16 +16 @@
-    data = models.BooleanField(null=True)
-
-class CharData(models.Model):
-
+_
-
-class DateData(models.Model):
-    data = models.DateField(null=True)
@@ -90 +90 @@
-        ordering = ["data"]
-
-class GenericData(models.Model):
-
+_
-
-    tags = generic.GenericRelation(Tag)
-    
@@ -102 +102 @@
-    """This is a model that can be used as 
-    something for other models to point at"""
-    
-
+_
-
-class UniqueAnchor(models.Model):
-    """This is a model that can be used as 
-    something for other models to point at"""
-
-
+_
-    
-class FKData(models.Model):
-    data = models.ForeignKey(Anchor, null=True)
@@ -144 +144 @@
-    data = models.BooleanField(primary_key=True)
-    
-class CharPKData(models.Model):
-
+_
-
-# class DatePKData(models.Model):
-#    data = models.DateField(primary_key=True)
@@ -208 +208 @@
-#     data = models.XMLField(primary_key=True)
-
-class ComplexModel(models.Model):
-
-
-
+_
+_
+_
-
-# Tests for handling fields with pre_save functions, or
-# models with save functions that modify data

tests/regressiontests/string_lookup/models.py

@@ -2 +2 @@
-from django.db import models
-
-class Foo(models.Model):
-
-
+_
+_
-
-    def __unicode__(self):
-        return "Foo %s" % self.name
-
-class Bar(models.Model):
-
+_
-    normal = models.ForeignKey(Foo, related_name='normal_foo')
-    fwd = models.ForeignKey("Whiz")
-    back = models.ForeignKey("Foo")
@@ -18 +18 @@
-        return "Bar %s" % self.place.name
-
-class Whiz(models.Model):
-
+_
-
-    def __unicode__(self):
-        return "Whiz %s" % self.name
-
-class Child(models.Model):
-    parent = models.OneToOneField('Base')
-
+_
-
-    def __unicode__(self):
-        return "Child %s" % self.name
-
-class Base(models.Model):
-
+_
-
-    def __unicode__(self):
-        return "Base %s" % self.name