Refs #23919 -- Removed unneeded force_str calls

4 files changed, 11 insertions, 16 deletions

diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
index 297796254d..c55173d6c9 100644
--- a/django/contrib/admin/utils.py
+++ b/django/contrib/admin/utils.py
@@ -11,7 +11,7 @@ from django.db.models.sql.constants import QUERY_TERMS
 from django.forms.utils import pretty_name
 from django.urls import NoReverseMatch, reverse
 from django.utils import formats, timezone
-from django.utils.encoding import force_str, force_text, smart_text
+from django.utils.encoding import force_text, smart_text
 from django.utils.html import format_html
 from django.utils.text import capfirst
 from django.utils.translation import (
@@ -340,12 +340,9 @@ def label_for_field(name, model, model_admin=None, return_attr=False):
             # field is likely a ForeignObjectRel
             label = field.related_model._meta.verbose_name
     except FieldDoesNotExist:
-        if name == "__unicode__":
+        if name == "__str__":
             label = force_text(model._meta.verbose_name)
             attr = str
-        elif name == "__str__":
-            label = force_str(model._meta.verbose_name)
-            attr = bytes
         else:
             if callable(name):
                 attr = name
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 0446cf501f..c52f31db59 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -13,7 +13,7 @@ from django.dispatch import receiver
 from django.utils.crypto import (
     constant_time_compare, get_random_string, pbkdf2,
 )
-from django.utils.encoding import force_bytes, force_str, force_text
+from django.utils.encoding import force_bytes, force_text
 from django.utils.module_loading import import_string
 from django.utils.translation import ugettext_noop as _
 
@@ -627,7 +627,7 @@ class CryptPasswordHasher(BasePasswordHasher):
     def encode(self, password, salt):
         crypt = self._load_library()
         assert len(salt) == 2
-        data = crypt.crypt(force_str(password), salt)
+        data = crypt.crypt(password, salt)
         assert data is not None  # A platform like OpenBSD with a dummy crypt module.
         # we don't need to store the salt, but Django used to do this
         return "%s$%s$%s" % (self.algorithm, '', data)
@@ -636,7 +636,7 @@ class CryptPasswordHasher(BasePasswordHasher):
         crypt = self._load_library()
         algorithm, salt, data = encoded.split('$', 2)
         assert algorithm == self.algorithm
-        return constant_time_compare(data, crypt.crypt(force_str(password), data))
+        return constant_time_compare(data, crypt.crypt(password, data))
 
     def safe_summary(self, encoded):
         algorithm, salt, data = encoded.split('$', 2)
diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py
index c0c4ce3c61..f4ec15a439 100644
--- a/django/contrib/auth/management/commands/changepassword.py
+++ b/django/contrib/auth/management/commands/changepassword.py
@@ -5,7 +5,6 @@ from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS
-from django.utils.encoding import force_str
 
 UserModel = get_user_model()
 
@@ -16,7 +15,7 @@ class Command(BaseCommand):
     requires_system_checks = False
 
     def _get_pass(self, prompt="Password: "):
-        p = getpass.getpass(prompt=force_str(prompt))
+        p = getpass.getpass(prompt=prompt)
         if not p:
             raise CommandError("aborted")
         return p
diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py
index 7a6d0b0231..d9fd70b6f1 100644
--- a/django/contrib/auth/management/commands/createsuperuser.py
+++ b/django/contrib/auth/management/commands/createsuperuser.py
@@ -10,7 +10,6 @@ from django.contrib.auth.password_validation import validate_password
 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.text import capfirst
 
 
@@ -103,12 +102,12 @@ class Command(BaseCommand):
                     if default_username:
                         input_msg += " (leave blank to use '%s')" % default_username
                     username_rel = self.username_field.remote_field
-                    input_msg = force_str('%s%s: ' % (
+                    input_msg = '%s%s: ' % (
                         input_msg,
                         ' (%s.%s)' % (
                             username_rel.model._meta.object_name,
                             username_rel.field_name
-                        ) if username_rel else '')
+                        ) if username_rel else ''
                     )
                     username = self.get_input_data(self.username_field, input_msg, default_username)
                     if not username:
@@ -126,13 +125,13 @@ class Command(BaseCommand):
                     field = self.UserModel._meta.get_field(field_name)
                     user_data[field_name] = options[field_name]
                     while user_data[field_name] is None:
-                        message = force_str('%s%s: ' % (
+                        message = '%s%s: ' % (
                             capfirst(field.verbose_name),
                             ' (%s.%s)' % (
                                 field.remote_field.model._meta.object_name,
                                 field.remote_field.field_name,
                             ) if field.remote_field else '',
-                        ))
+                        )
                         input_value = self.get_input_data(field, message)
                         user_data[field_name] = input_value
                         fake_user_data[field_name] = input_value
@@ -144,7 +143,7 @@ class Command(BaseCommand):
                 # Get a password
                 while password is None:
                     password = getpass.getpass()
-                    password2 = getpass.getpass(force_str('Password (again): '))
+                    password2 = getpass.getpass('Password (again): ')
                     if password != password2:
                         self.stderr.write("Error: Your passwords didn't match.")
                         password = None