p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for Python 3 compatibility.

This commit is contained in:
Russell Keith-Magee 2012-09-16 18:09:27 +08:00
parent dfd72131d8
commit dbb3900775
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/auth/management/commands/createsuperuser.py
View File

@ -62,7 +62,7 @@ class Command(BaseCommand):
other_data[field_name] = field.clean(options[field_name], None) other_data[field_name] = field.clean(options[field_name], None)
else: else:
raise CommandError("You must use --%s with --noinput." % field_name) raise CommandError("You must use --%s with --noinput." % field_name)
except exceptions.ValidationError, e: except exceptions.ValidationError as e:
raise CommandError('; '.join(e.messages)) raise CommandError('; '.join(e.messages))
else: else:
@ -84,7 +84,7 @@ class Command(BaseCommand):
username = default_username username = default_username
try: try:
username = username_field.clean(raw_value, None) username = username_field.clean(raw_value, None)
except exceptions.ValidationError, e: except exceptions.ValidationError as e:
self.stderr.write("Error: %s" % '; '.join(e.messages)) self.stderr.write("Error: %s" % '; '.join(e.messages))
username = None username = None
continue continue
@ -105,7 +105,7 @@ class Command(BaseCommand):
raw_value = input(capfirst(field.verbose_name + ': ')) raw_value = input(capfirst(field.verbose_name + ': '))
try: try:
other_data[field_name] = field.clean(raw_value, None) other_data[field_name] = field.clean(raw_value, None)
except exceptions.ValidationError, e: except exceptions.ValidationError as e:
self.stderr.write("Error: %s" % '; '.join(e.messages)) self.stderr.write("Error: %s" % '; '.join(e.messages))
other_data[field_name] = None other_data[field_name] = None

2
django/contrib/auth/models.py
View File

@ -289,7 +289,7 @@ class AbstractUser(AbstractBaseUser):
help_text=_('Required. 30 characters or fewer. Letters, numbers and ' help_text=_('Required. 30 characters or fewer. Letters, numbers and '
'@/./+/-/_ characters'), '@/./+/-/_ characters'),
validators=[ validators=[
validators.RegexValidator(re.compile('^[\w.@+-]+$'), _(u'Enter a valid username.'), 'invalid') validators.RegexValidator(re.compile('^[\w.@+-]+$'), _('Enter a valid username.'), 'invalid')
]) ])
first_name = models.CharField(_('first name'), max_length=30, blank=True) first_name = models.CharField(_('first name'), max_length=30, blank=True)
last_name = models.CharField(_('last name'), max_length=30, blank=True) last_name = models.CharField(_('last name'), max_length=30, blank=True)

2
django/db/models/base.py
View File

@ -110,7 +110,7 @@ class ModelBase(type):
# If the model is a proxy, ensure that the base class # If the model is a proxy, ensure that the base class
# hasn't been swapped out. # hasn't been swapped out.
if is_proxy and base_meta.swapped: if is_proxy and base_meta and base_meta.swapped:
raise TypeError("%s cannot proxy the swapped model '%s'." % (name, base_meta.swapped)) raise TypeError("%s cannot proxy the swapped model '%s'." % (name, base_meta.swapped))
if getattr(new_class, '_default_manager', None): if getattr(new_class, '_default_manager', None):