Ticket #5342: new_emailfield.diff

django/db/models/fields/__init__.py

@@ -680 +680 @@
 
 class EmailField(CharField):
     def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 75
+        if 'max_length' not in kwargs:
+            kwargs['max_length'] = 75
         CharField.__init__(self, *args, **kwargs)
 
     def get_internal_type(self):

docs/model-api.txt

@@ -221 +221 @@
 ~~~~~~~~~~~~~~
 
 A ``CharField`` that checks that the value is a valid e-mail address.
-This doesn't accept ``max_length``; its ``max_length`` is automatically set to
-75.
+If ``max_length`` isn't specified, it is automatically set to 75.
 
 ``FileField``
 ~~~~~~~~~~~~~