Fixed #3165 -- Really allow underscores when making a superuser, thanks `SmileyChris`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
38fe6bf0fa
commit
298d76aed4
|
@ -10,6 +10,9 @@ from django.contrib.auth.models import User
|
||||||
import getpass
|
import getpass
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import re
|
||||||
|
|
||||||
|
RE_VALID_USERNAME = re.compile('\w+$')
|
||||||
|
|
||||||
def createsuperuser(username=None, email=None, password=None):
|
def createsuperuser(username=None, email=None, password=None):
|
||||||
"""
|
"""
|
||||||
|
@ -43,7 +46,7 @@ def createsuperuser(username=None, email=None, password=None):
|
||||||
username = raw_input(input_msg + ': ')
|
username = raw_input(input_msg + ': ')
|
||||||
if default_username and username == '':
|
if default_username and username == '':
|
||||||
username = default_username
|
username = default_username
|
||||||
if not username.isalnum():
|
if not RE_VALID_USERNAME.match(username):
|
||||||
sys.stderr.write("Error: That username is invalid. Use only letters, digits and underscores.\n")
|
sys.stderr.write("Error: That username is invalid. Use only letters, digits and underscores.\n")
|
||||||
username = None
|
username = None
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in New Issue