Refs #23919 -- Removed six.PY2/PY3 usage

Thanks Tim Graham for the review.

django/contrib/admindocs/views.py

@@ -15,7 +15,6 @@
 from django.http import Http404
 from django.template.engine import Engine
 from django.urls import get_mod_func, get_resolver, get_urlconf, reverse
-from django.utils import six
 from django.utils.decorators import method_decorator
 from django.utils.inspect import (
     func_accepts_kwargs, func_accepts_var_args, func_has_no_args,
@@ -132,12 +131,7 @@ class ViewIndexView(BaseAdminDocsView):
     @staticmethod
     def _get_full_name(func):
         mod_name = func.__module__
-        if six.PY3:
-            return '%s.%s' % (mod_name, func.__qualname__)
-        else:
-            # PY2 does not support __qualname__
-            func_name = getattr(func, '__name__', func.__class__.__name__)
-            return '%s.%s' % (mod_name, func_name)
+        return '%s.%s' % (mod_name, func.__qualname__)
 
     def get_context_data(self, **kwargs):
         views = []

django/contrib/auth/management/__init__.py

@@ -8,8 +8,6 @@
 from django.contrib.auth import get_permission_codename
 from django.core import exceptions
 from django.db import DEFAULT_DB_ALIAS, router
-from django.utils import six
-from django.utils.encoding import DEFAULT_LOCALE_ENCODING
 
 
 def _get_all_permissions(opts):
@@ -98,12 +96,6 @@ def get_system_username():
         # if there is no corresponding entry in the /etc/passwd file
         # (a very restricted chroot environment, for example).
         return ''
-    if six.PY2:
-        try:
-            result = result.decode(DEFAULT_LOCALE_ENCODING)
-        except UnicodeDecodeError:
-            # UnicodeDecodeError - preventive treatment for non-latin Windows.
-            return ''
     return result
 
 

django/contrib/auth/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 import django.contrib.auth.models
 from django.contrib.auth import validators
 from django.db import migrations, models
-from django.utils import six, timezone
+from django.utils import timezone
 
 
 class Migration(migrations.Migration):
@@ -63,9 +63,7 @@ class Migration(migrations.Migration):
                 ('username', models.CharField(
                     help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True,
                     max_length=30, verbose_name='username',
-                    validators=[
-                        validators.UnicodeUsernameValidator() if six.PY3 else validators.ASCIIUsernameValidator()
-                    ],
+                    validators=[validators.UnicodeUsernameValidator()],
                 )),
                 ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)),
                 ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)),

django/contrib/auth/migrations/0004_alter_user_username_opts.py

@@ -1,6 +1,5 @@
 from django.contrib.auth import validators
 from django.db import migrations, models
-from django.utils import six
 
 
 class Migration(migrations.Migration):
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
             name='username',
             field=models.CharField(
                 error_messages={'unique': 'A user with that username already exists.'}, max_length=30,
-                validators=[validators.UnicodeUsernameValidator() if six.PY3 else validators.ASCIIUsernameValidator()],
+                validators=[validators.UnicodeUsernameValidator()],
                 help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
                 unique=True, verbose_name='username'
             ),

django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py

@@ -1,6 +1,5 @@
 from django.contrib.auth import validators
 from django.db import migrations, models
-from django.utils import six
 
 
 class Migration(migrations.Migration):
@@ -18,7 +17,7 @@ class Migration(migrations.Migration):
                 help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
                 max_length=30,
                 unique=True,
-                validators=[validators.UnicodeUsernameValidator() if six.PY3 else validators.ASCIIUsernameValidator()],
+                validators=[validators.UnicodeUsernameValidator()],
                 verbose_name='username',
             ),
         ),

django/contrib/auth/migrations/0008_alter_user_username_max_length.py

@@ -1,6 +1,5 @@
 from django.contrib.auth import validators
 from django.db import migrations, models
-from django.utils import six
 
 
 class Migration(migrations.Migration):
@@ -18,7 +17,7 @@ class Migration(migrations.Migration):
                 help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.',
                 max_length=150,
                 unique=True,
-                validators=[validators.UnicodeUsernameValidator() if six.PY3 else validators.ASCIIUsernameValidator()],
+                validators=[validators.UnicodeUsernameValidator()],
                 verbose_name='username',
             ),
         ),

django/contrib/auth/models.py

@@ -9,7 +9,7 @@
 from django.utils import six, timezone
 from django.utils.translation import ugettext_lazy as _
 
-from .validators import ASCIIUsernameValidator, UnicodeUsernameValidator
+from .validators import UnicodeUsernameValidator
 
 
 def update_last_login(sender, user, **kwargs):
@@ -297,7 +297,7 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
 
     Username and password are required. Other fields are optional.
     """
-    username_validator = UnicodeUsernameValidator() if six.PY3 else ASCIIUsernameValidator()
+    username_validator = UnicodeUsernameValidator()
 
     username = models.CharField(
         _('username'),

django/contrib/auth/validators.py

@@ -1,7 +1,6 @@
 import re
 
 from django.core import validators
-from django.utils import six
 from django.utils.deconstruct import deconstructible
 from django.utils.translation import ugettext_lazy as _
 
@@ -13,7 +12,7 @@ class ASCIIUsernameValidator(validators.RegexValidator):
         'Enter a valid username. This value may contain only English letters, '
         'numbers, and @/./+/-/_ characters.'
     )
-    flags = re.ASCII if six.PY3 else 0
+    flags = re.ASCII
 
 
 @deconstructible
@@ -23,4 +22,4 @@ class UnicodeUsernameValidator(validators.RegexValidator):
         'Enter a valid username. This value may contain only letters, '
         'numbers, and @/./+/-/_ characters.'
     )
-    flags = re.UNICODE if six.PY2 else 0
+    flags = 0

django/contrib/gis/utils/ogrinspect.py

@@ -235,5 +235,4 @@ def get_kwargs_str(field_name):
 
     if name_field:
         yield ''
-        yield '    def __%s__(self): return self.%s' % (
-            'str' if six.PY3 else 'unicode', name_field)
+        yield '    def __str__(self): return self.%s' % name_field

django/contrib/postgres/signals.py

@@ -1,18 +1,13 @@
 from psycopg2 import ProgrammingError
 from psycopg2.extras import register_hstore
 
-from django.utils import six
-
 
 def register_hstore_handler(connection, **kwargs):
     if connection.vendor != 'postgresql':
         return
 
     try:
-        if six.PY2:
-            register_hstore(connection.connection, globally=True, unicode=True)
-        else:
-            register_hstore(connection.connection, globally=True)
+        register_hstore(connection.connection, globally=True)
     except ProgrammingError:
         # Hstore is not available on the database.
         #

django/core/cache/backends/db.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
 from django.db import DatabaseError, connections, models, router, transaction
-from django.utils import six, timezone
+from django.utils import timezone
 from django.utils.encoding import force_bytes
 
 try:
@@ -112,11 +112,9 @@ def _base_set(self, mode, key, value, timeout=DEFAULT_TIMEOUT):
             if num > self._max_entries:
                 self._cull(db, cursor, now)
             pickled = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
-            b64encoded = base64.b64encode(pickled)
             # The DB column is expecting a string, so make sure the value is a
             # string, not bytes. Refs #19274.
-            if six.PY3:
-                b64encoded = b64encoded.decode('latin1')
+            b64encoded = base64.b64encode(pickled).decode('latin1')
             try:
                 # Note: typecasting for datetimes is needed by some 3rd party
                 # database backends. All core backends work without typecasting,

django/core/exceptions.py

@@ -1,7 +1,6 @@
 """
 Global Django exception and warning classes.
 """
-from django.utils import six
 from django.utils.encoding import force_text
 
 
@@ -115,10 +114,7 @@ def __init__(self, message, code=None, params=None):
         if isinstance(message, ValidationError):
             if hasattr(message, 'error_dict'):
                 message = message.error_dict
-            # PY2 has a `message` property which is always there so we can't
-            # duck-type on it. It was introduced in Python 2.5 and already
-            # deprecated in Python 2.6.
-            elif not hasattr(message, 'message' if six.PY3 else 'code'):
+            elif not hasattr(message, 'message'):
                 message = message.error_list
             else:
                 message, code, params = message.message, message.code, message.params

django/core/files/base.py

@@ -3,7 +3,7 @@
 
 from django.core.files.utils import FileProxyMixin
 from django.utils import six
-from django.utils.encoding import force_bytes, force_str, force_text
+from django.utils.encoding import force_str, force_text
 
 
 class File(FileProxyMixin):
@@ -140,11 +140,7 @@ class ContentFile(File):
     A File-like object that takes just raw content, rather than an actual file.
     """
     def __init__(self, content, name=None):
-        if six.PY3:
-            stream_class = StringIO if isinstance(content, six.text_type) else BytesIO
-        else:
-            stream_class = BytesIO
-            content = force_bytes(content)
+        stream_class = StringIO if isinstance(content, six.text_type) else BytesIO
         super(ContentFile, self).__init__(stream_class(content), name=name)
         self.size = len(content)
 

django/core/handlers/wsgi.py

@@ -8,7 +8,6 @@
 from django.core import signals
 from django.core.handlers import base
 from django.urls import set_script_prefix
-from django.utils import six
 from django.utils.encoding import (
     force_str, force_text, repercent_broken_unicode,
 )
@@ -212,22 +211,20 @@ def get_bytes_from_wsgi(environ, key, default):
     """
     Get a value from the WSGI environ dictionary as bytes.
 
-    key and default should be str objects. Under Python 2 they may also be
-    unicode objects provided they only contain ASCII characters.
+    key and default should be str objects.
     """
     value = environ.get(str(key), str(default))
-    # Under Python 3, non-ASCII values in the WSGI environ are arbitrarily
-    # decoded with ISO-8859-1. This is wrong for Django websites where UTF-8
-    # is the default. Re-encode to recover the original bytestring.
-    return value.encode(ISO_8859_1) if six.PY3 else value
+    # Non-ASCII values in the WSGI environ are arbitrarily decoded with
+    # ISO-8859-1. This is wrong for Django websites where UTF-8 is the default.
+    # Re-encode to recover the original bytestring.
+    return value.encode(ISO_8859_1)
 
 
 def get_str_from_wsgi(environ, key, default):
     """
     Get a value from the WSGI environ dictionary as str.
 
-    key and default should be str objects. Under Python 2 they may also be
-    unicode objects provided they only contain ASCII characters.
+    key and default should be str objects.
     """
     value = get_bytes_from_wsgi(environ, key, default)
-    return value.decode(UTF_8, errors='replace') if six.PY3 else value
+    return value.decode(UTF_8, errors='replace')

django/core/mail/backends/console.py

@@ -5,7 +5,6 @@
 import threading
 
 from django.core.mail.backends.base import BaseEmailBackend
-from django.utils import six
 
 
 class EmailBackend(BaseEmailBackend):
@@ -17,9 +16,8 @@ def __init__(self, *args, **kwargs):
     def write_message(self, message):
         msg = message.message()
         msg_data = msg.as_bytes()
-        if six.PY3:
-            charset = msg.get_charset().get_output_charset() if msg.get_charset() else 'utf-8'
-            msg_data = msg_data.decode(charset)
+        charset = msg.get_charset().get_output_charset() if msg.get_charset() else 'utf-8'
+        msg_data = msg_data.decode(charset)
         self.stream.write('%s\n' % msg_data)
         self.stream.write('-' * 79)
         self.stream.write('\n')

django/core/mail/message.py

@@ -5,7 +5,9 @@
 from email import (
     charset as Charset, encoders as Encoders, generator, message_from_string,
 )
+from email.errors import InvalidHeaderDefect, NonASCIILocalPartDefect
 from email.header import Header
+from email.headerregistry import Address
 from email.message import Message
 from email.mime.base import MIMEBase
 from email.mime.message import MIMEMessage
@@ -139,18 +141,8 @@ def sanitize_address(addr, encoding):
     except UnicodeEncodeError:  # IDN or non-ascii in the local part
         localpart, domain = split_addr(addr, encoding)
 
-    if six.PY2:
-        # On Python 2, use the stdlib since `email.headerregistry` doesn't exist.
-        from email.utils import formataddr
-        if localpart and domain:
-            addr = '@'.join([localpart, domain])
-        return formataddr((nm, addr))
-
-    # On Python 3, an `email.headerregistry.Address` object is used since
+    # An `email.headerregistry.Address` object is used since
     # email.utils.formataddr() naively encodes the name as ascii (see #25986).
-    from email.headerregistry import Address
-    from email.errors import InvalidHeaderDefect, NonASCIILocalPartDefect
-
     if localpart and domain:
         address = Address(nm, username=localpart, domain=domain)
         return str(address)
@@ -174,27 +166,21 @@ def as_string(self, unixfrom=False, linesep='\n'):
         """
         fp = six.StringIO()
         g = generator.Generator(fp, mangle_from_=False)
-        if six.PY2:
-            g.flatten(self, unixfrom=unixfrom)
-        else:
-            g.flatten(self, unixfrom=unixfrom, linesep=linesep)
+        g.flatten(self, unixfrom=unixfrom, linesep=linesep)
         return fp.getvalue()
 
-    if six.PY2:
-        as_bytes = as_string
-    else:
-        def as_bytes(self, unixfrom=False, linesep='\n'):
-            """Return the entire formatted message as bytes.
-            Optional `unixfrom' when True, means include the Unix From_ envelope
-            header.
+    def as_bytes(self, unixfrom=False, linesep='\n'):
+        """Return the entire formatted message as bytes.
+        Optional `unixfrom' when True, means include the Unix From_ envelope
+        header.
 
-            This overrides the default as_bytes() implementation to not mangle
-            lines that begin with 'From '. See bug #13433 for details.
-            """
-            fp = BytesIO()
-            g = generator.BytesGenerator(fp, mangle_from_=False)
-            g.flatten(self, unixfrom=unixfrom, linesep=linesep)
-            return fp.getvalue()
+        This overrides the default as_bytes() implementation to not mangle
+        lines that begin with 'From '. See bug #13433 for details.
+        """
+        fp = BytesIO()
+        g = generator.BytesGenerator(fp, mangle_from_=False)
+        g.flatten(self, unixfrom=unixfrom, linesep=linesep)
+        return fp.getvalue()
 
 
 class SafeMIMEMessage(MIMEMixin, MIMEMessage):
@@ -450,8 +436,6 @@ def _create_attachment(self, filename, content, mimetype=None):
             try:
                 filename.encode('ascii')
             except UnicodeEncodeError:
-                if six.PY2:
-                    filename = filename.encode('utf-8')
                 filename = ('utf-8', '', filename)
             attachment.add_header('Content-Disposition', 'attachment',
                                   filename=filename)

django/core/management/commands/loaddata.py

@@ -20,7 +20,6 @@
 from django.utils._os import upath
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
-from django.utils.glob import glob_escape
 
 try:
     import bz2
@@ -238,7 +237,7 @@ def find_fixtures(self, fixture_label):
                 self.stdout.write("Checking %s for fixtures..." % humanize(fixture_dir))
             fixture_files_in_dir = []
             path = os.path.join(fixture_dir, fixture_name)
-            for candidate in glob.iglob(glob_escape(path) + '*'):
+            for candidate in glob.iglob(glob.escape(path) + '*'):
                 if os.path.basename(candidate) in targets:
                     # Save the fixture_dir and fixture_name for future error messages.
                     fixture_files_in_dir.append((candidate, fixture_dir, fixture_name))