Django

Code

Changeset 6205

Show
Ignore:
Timestamp:
09/14/07 14:22:43 (1 year ago)
Author:
adrian
Message:

Fixed #5342 -- Added max_length parameter to EmailField?. Thanks, donspaulding and gwilson

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6195 r6205  
    687687class EmailField(CharField): 
    688688    def __init__(self, *args, **kwargs): 
    689         kwargs['max_length'] = 75 
     689        if 'max_length' not in kwargs: 
     690            kwargs['max_length'] = 75 
    690691        CharField.__init__(self, *args, **kwargs) 
    691692 

  • django/trunk/docs/model-api.txt

    r6179 r6205  
    222222 
    223223A ``CharField`` that checks that the value is a valid e-mail address. 
    224 This doesn't accept ``max_length``; its ``max_length`` is automatically set to 
    225 75. 
     224 
     225In Django 0.96, this doesn't accept ``max_length``; its ``max_length`` is 
     226automatically set to 75. In the Django development version, ``max_length`` is 
     227set to 75 by default, but you can specify it to override default behavior. 
    226228 
    227229``FileField``