Ticket #5786: form.1.patch

django/conf/global_settings.py

@@ -335 +335 @@
 
 LOGIN_REDIRECT_URL = '/accounts/profile/'
 
+AUTH_USERNAME_PATTERN = r'^\w+$'
 ###########
 # TESTING #
 ###########

django/contrib/auth/forms.py

@@ -6 +6 @@
 from django import oldforms
 from django.utils.translation import ugettext as _
 
+import re
+from django.conf import settings
+
 class UserCreationForm(oldforms.Manipulator):
     "A form that creates a user, with no privileges, from the given username and password."
     def __init__(self):
         self.fields = (
             oldforms.TextField(field_name='username', length=30, max_length=30, is_required=True,
-                validator_list=[validators.isAlphaNumeric, self.isValidUsername]),
+                validator_list=[self.isValidUsername]),
             oldforms.PasswordField(field_name='password1', length=30, max_length=60, is_required=True),
             oldforms.PasswordField(field_name='password2', length=30, max_length=60, is_required=True,
                 validator_list=[validators.AlwaysMatchesOtherField('password1', _("The two password fields didn't match."))]),
         )
 
     def isValidUsername(self, field_data, all_data):
+        if not re.search(getattr(settings, 'AUTH_USERNAME_PATTERN'), field_data, re.U):
+            raise validators.ValidationError, _('Username contains illegal characters.')
+
         try:
             User.objects.get(username=field_data)
         except User.DoesNotExist:
-            return
+            return     
         raise validators.ValidationError, _('A user with that username already exists.')
 
     def save(self, new_data):

django/contrib/auth/tests.py

@@ -23 +23 @@
 []
 >>> a.user_permissions.all()
 []
-"""
- No newline at end of file
+>>> from django.contrib.auth.forms import *
+>>> cf = UserCreationForm()
+>>> cf.isValidUsername("aa", '')
+>>> cf.isValidUsername("b!", '')
+Traceback (most recent call last):
+...
+ValidationError: [u'Username contains illegal characters.']
+    
+"""

docs/settings.txt

@@ -225 +225 @@
 ``CommonMiddleware`` is installed (see the `middleware docs`_). See also
 ``PREPEND_WWW``.
 
+AUTH_USERNAME_PATTERN
+---------------------
+
+Default: r''^\w+$''
+
+A pattern which the username in auth moduel has to match, which can be coded with UTF-8.
+
 AUTHENTICATION_BACKENDS
 -----------------------
 

docs/tutorial02.txt

@@ -359 +359 @@
 filters, date-hierarchies and column-header-ordering all work together like you
 think they should.
 
+Customize the username pattern
+======================================
+
+Open your settings file (``mysite/settings.py``, remember) and look at the
+``AUTH_USERNAME_PATTERN`` setting. The default value is ''^\w+$'', which you
+may change it to any pattern in UTF-8, for example, '^ab.*$'.
+
 Customize the admin look and feel
 =================================