First round of removal of python 2

References: #4600
Change-Id: I61e35bc93fe95610ae75b31c18a3282558cd4ffe

4 files changed, 2 insertions, 28 deletions

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index bdd69431e..327f76715 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -75,7 +75,6 @@ from .compat import parse_qsl
 from .compat import perf_counter
 from .compat import pickle
 from .compat import print_
-from .compat import py2k
 from .compat import py37
 from .compat import py38
 from .compat import py39
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 535ae4780..54ed522d4 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -16,7 +16,6 @@ import weakref
 from .compat import binary_types
 from .compat import collections_abc
 from .compat import itertools_filterfalse
-from .compat import py2k
 from .compat import py37
 from .compat import string_types
 from .compat import threading
@@ -322,17 +321,6 @@ else:
         def items(self):
             return [(key, self[key]) for key in self._list]
 
-        if py2k:
-
-            def itervalues(self):
-                return iter(self.values())
-
-            def iterkeys(self):
-                return iter(self)
-
-            def iteritems(self):
-                return iter(self.items())
-
         def __setitem__(self, key, obj):
             if key not in self:
                 try:
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 5914e8681..5749b3337 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -18,7 +18,6 @@ py39 = sys.version_info >= (3, 9)
 py38 = sys.version_info >= (3, 8)
 py37 = sys.version_info >= (3, 7)
 py3k = sys.version_info >= (3, 0)
-py2k = sys.version_info < (3, 0)
 pypy = platform.python_implementation() == "PyPy"
 
 
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 89ca4c1eb..84c5fddec 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -304,7 +304,7 @@ def %(name)s(%(args)s):
             % (decorated.__module__,)
         )
 
-    if compat.py2k or hasattr(fn, "__func__"):
+    if hasattr(fn, "__func__"):
         fn.__func__.__doc__ = doc
         if not hasattr(fn.__func__, "_linked_to"):
             fn.__func__._linked_to = (decorated, location)
@@ -888,24 +888,12 @@ def class_hierarchy(cls):
     will not be descended.
 
     """
-    if compat.py2k:
-        if isinstance(cls, types.ClassType):
-            return list()
 
     hier = {cls}
     process = list(cls.__mro__)
     while process:
         c = process.pop()
-        if compat.py2k:
-            if isinstance(c, types.ClassType):
-                continue
-            bases = (
-                _
-                for _ in c.__bases__
-                if _ not in hier and not isinstance(_, types.ClassType)
-            )
-        else:
-            bases = (_ for _ in c.__bases__ if _ not in hier)
+        bases = (_ for _ in c.__bases__ if _ not in hier)
 
         for b in bases:
             process.append(b)