Ticket #19745: 19745.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
 
@@ -82 +82 @@
                 # Get a username
                 while username is None:
                     if not username:
-                        input_msg = capfirst(self.username_field.verbose_name)
+                        input_msg = force_text(capfirst(self.username_field.verbose_name))
                         if default_username:
                             input_msg = "%s (leave blank to use '%s')" % (
                                 input_msg, default_username)
@@ -109 +109 @@
                     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('%s: ' % force_text(capfirst(field.verbose_name)))
                         try:
                             user_data[field_name] = field.clean(raw_value, None)
                         except exceptions.ValidationError as e: