Ticket #19745: 19745-2.diff

django/contrib/auth/management/commands/createsuperuser.py

@@ -11 +11 @@
 from django.core import exceptions
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS
-from django.utils.encoding import force_str
+from django.utils.encoding import force_str, force_text
 from django.utils.six.moves import input
 from django.utils.text import capfirst
 
@@ -80 +80 @@
             try:
 
                 # Get a username
+                verbose_field_name = force_text(self.username_field.verbose_name)
                 while username is None:
                     if not username:
-                        input_msg = capfirst(self.username_field.verbose_name)
+                        input_msg = capfirst(verbose_field_name)
                         if default_username:
                             input_msg = "%s (leave blank to use '%s')" % (
                                 input_msg, default_username)
@@ -102 +103 @@
                         pass
                     else:
                         self.stderr.write("Error: That %s is already taken." %
-                                self.username_field.verbose_name)
+                                verbose_field_name)
                         username = None
 
                 for field_name in self.UserModel.REQUIRED_FIELDS:
                     field = self.UserModel._meta.get_field(field_name)
                     user_data[field_name] = options.get(field_name)
                     while user_data[field_name] is None:
-                        raw_value = input(force_str('%s: ' % capfirst(field.verbose_name)))
+                        raw_value = input(force_str('%s: ' % capfirst(force_text(field.verbose_name))))
                         try:
                             user_data[field_name] = field.clean(raw_value, None)
                         except exceptions.ValidationError as e:

django/contrib/auth/tests/basic.py

@@ -29 +29 @@
             def mock_input(prompt):
                 # prompt should be encoded in Python 2. This line will raise an
                 # Exception if prompt contains unencoded non-ascii on Python 2.
+                assert str('__proxy__') not in prompt
                 prompt = str(prompt)
                 if str('leave blank to use') in prompt:
                     return inputs['username']
@@ -180 +181 @@
 
     @mock_inputs({'password': "nopasswd", 'username': 'foo'})
     def test_createsuperuser_non_ascii_verbose_name(self):
+        # Aliased so the string doesn't get extracted
+        from django.utils.translation import ugettext_lazy as ulazy
         username_field = User._meta.get_field('username')
         old_verbose_name = username_field.verbose_name
-        username_field.verbose_name = 'uživatel'
+        username_field.verbose_name = ulazy('uživatel')
         new_io = StringIO()
         try:
             call_command("createsuperuser",