Merge pull request #4096 from Avasam/update-python-3.2-to-3.6-code

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments

_distutils_hack/__init__.py

@@ -3,16 +3,9 @@
 import os
 
 
-is_pypy = '__pypy__' in sys.builtin_module_names
-
-
 def warn_distutils_present():
     if 'distutils' not in sys.modules:
         return
-    if is_pypy and sys.version_info < (3, 7):
-        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
-        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
-        return
     import warnings
 
     warnings.warn(

conftest.py

@@ -41,11 +41,6 @@ def pytest_configure(config):
 ]
 
 
-if sys.version_info < (3, 6):
-    collect_ignore.append('docs/conf.py')  # uses f-strings
-    collect_ignore.append('pavement.py')
-
-
 if sys.version_info < (3, 9) or sys.platform == 'cygwin':
     collect_ignore.append('tools/finalize.py')
 

docs/userguide/declarative_config.rst

@@ -39,10 +39,10 @@ boilerplate code in some cases.
     zip_safe = False
     include_package_data = True
     packages = find:
-    python_requires = >=3.7
+    python_requires = >=3.8
     install_requires =
         requests
-        importlib-metadata; python_version<"3.8"
+        importlib-metadata; python_version<"3.10"
 
     [options.package_data]
     * = *.txt, *.rst
@@ -271,11 +271,11 @@ data_files               section                              40.6.0          [#
 
       [options]
       install_requires =
-          importlib-metadata; python_version<"3.8"
+          importlib-metadata; python_version<"3.10"
 
       [options.extras_require]
       all =
-          importlib-metadata; python_version < "3.8"
+          importlib-metadata; python_version<"3.10"
 
 .. [#opt-3] The ``find:`` and ``find_namespace:`` directive can be further configured
    in a dedicated subsection ``options.packages.find``. This subsection accepts the

docs/userguide/entry_point.rst

@@ -486,9 +486,10 @@ entry points remains the same as for console/GUI scripts, and is discussed in th
 .. tip::
     The recommended approach for loading and importing entry points is the
     :mod:`importlib.metadata` module,
-    which is a part of the standard library since Python 3.8. For older versions of
-    Python, its backport :pypi:`importlib_metadata` should be used. While using the
-    backport, the only change that has to be made is to replace ``importlib.metadata``
+    which is a part of the standard library since Python 3.8 and is non-provisional
+    since Python 3.10. For older versions of Python, its backport
+    :pypi:`importlib_metadata` should be used. While using the backport, the only
+    change that has to be made is to replace ``importlib.metadata``
     with ``importlib_metadata``, i.e.
 
     .. code-block:: python

docs/userguide/pyproject_config.rst

@@ -47,7 +47,7 @@ The ``project`` table contains metadata fields as described by the
    ]
    description = "My package description"
    readme = "README.rst"
-   requires-python = ">=3.7"
+   requires-python = ">=3.8"
    keywords = ["one", "two"]
    license = {text = "BSD-3-Clause"}
    classifiers = [
@@ -56,7 +56,7 @@ The ``project`` table contains metadata fields as described by the
    ]
    dependencies = [
        "requests",
-       'importlib-metadata; python_version<"3.8"',
+       'importlib-metadata; python_version<"3.10"',
    ]
    dynamic = ["version"]
 

docs/userguide/quickstart.rst

@@ -85,7 +85,7 @@ The following example demonstrates a minimum configuration
        version = "0.0.1"
        dependencies = [
            "requests",
-           'importlib-metadata; python_version<"3.8"',
+           'importlib-metadata; python_version<"3.10"',
        ]
 
     See :doc:`/userguide/pyproject_config` for more information.
@@ -101,7 +101,8 @@ The following example demonstrates a minimum configuration
         [options]
         install_requires =
             requests
-            importlib-metadata; python_version < "3.8"
+            importlib-metadata; python_version<"3.10"
+
 
     See :doc:`/userguide/declarative_config` for more information.
 
@@ -116,7 +117,7 @@ The following example demonstrates a minimum configuration
             version='0.0.1',
             install_requires=[
                 'requests',
-                'importlib-metadata; python_version == "3.8"',
+                'importlib-metadata; python_version<"3.10"',
             ],
         )
 

newsfragments/4096.doc.rst

@@ -0,0 +1 @@
+Updated documentation referencing obsolete Python 3.7 code. -- by :user:`Avasam`

newsfragments/4096.feature.rst

@@ -0,0 +1 @@
+Updated and removed obsolete Python < 3.8 code and comments. -- by :user:`Avasam`

pkg_resources/__init__.py

@@ -18,6 +18,10 @@
 """
 
 import sys
+
+if sys.version_info < (3, 8):
+    raise RuntimeError("Python 3.8 or later is required")
+
 import os
 import io
 import time
@@ -43,16 +47,7 @@
 import importlib
 from pkgutil import get_importer
 
-try:
-    import _imp
-except ImportError:
-    # Python 3.2 compatibility
-    import imp as _imp
-
-try:
-    FileExistsError
-except NameError:
-    FileExistsError = OSError
+import _imp
 
 # capture these to bypass sandboxing
 from os import utime
@@ -91,9 +86,6 @@
 __import__('pkg_resources.extern.packaging.markers')
 __import__('pkg_resources.extern.packaging.utils')
 
-if sys.version_info < (3, 5):
-    raise RuntimeError("Python 3.5 or later is required")
-
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None

pkg_resources/tests/test_pkg_resources.py

@@ -4,7 +4,6 @@
 import os
 import zipfile
 import datetime
-import time
 import plistlib
 import subprocess
 import stat
@@ -24,17 +23,6 @@
 import pkg_resources
 
 
-def timestamp(dt):
-    """
-    Return a timestamp for a local, naive datetime instance.
-    """
-    try:
-        return dt.timestamp()
-    except AttributeError:
-        # Python 3.2 and earlier
-        return time.mktime(dt.timetuple())
-
-
 class EggRemover(str):
     def __call__(self):
         if self in sys.path:
@@ -125,7 +113,7 @@ def test_resource_filename_rewrites_on_change(self):
         f = open(filename, 'w')
         f.write('hello, world?')
         f.close()
-        ts = timestamp(self.ref_time)
+        ts = self.ref_time.timestamp()
         os.utime(filename, (ts, ts))
         filename = zp.get_resource_filename(manager, 'data.dat')
         with open(filename) as f:
@@ -243,9 +231,6 @@ def make_distribution_no_version(tmpdir, basename):
     # will detect it and yield it.
     dist_dir.join('temp.txt').ensure()
 
-    if sys.version_info < (3, 6):
-        dist_dir = str(dist_dir)
-
     dists = list(pkg_resources.distributions_from_metadata(dist_dir))
     assert len(dists) == 1
     (dist,) = dists

pkg_resources/tests/test_resources.py

@@ -21,7 +21,7 @@
 )
 
 
-# from Python 3.6 docs.
+# from Python 3.6 docs. Available from itertools on Python 3.10
 def pairwise(iterable):
     "s -> (s0,s1), (s1,s2), (s2, s3), ..."
     a, b = itertools.tee(iterable)

setuptools/command/bdist_egg.py

@@ -369,10 +369,7 @@ def scan_module(egg_dir, base, name, stubs):
         return True  # Extension module
     pkg = base[len(egg_dir) + 1 :].replace(os.sep, '.')
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
-    if sys.version_info < (3, 7):
-        skip = 12  # skip magic & date & file size
-    else:
-        skip = 16  # skip magic & reserved? & date & file size
+    skip = 16  # skip magic & reserved? & date & file size
     f = open(filename, 'rb')
     f.read(skip)
     code = marshal.load(f)

setuptools/command/build.py

@@ -1,17 +1,8 @@
-import sys
-from typing import TYPE_CHECKING, List, Dict
+from typing import Dict, List, Protocol
 from distutils.command.build import build as _build
 
 from ..warnings import SetuptoolsDeprecationWarning
 
-if sys.version_info >= (3, 8):
-    from typing import Protocol
-elif TYPE_CHECKING:
-    from typing_extensions import Protocol
-else:
-    from abc import ABC as Protocol
-
-
 _ORIGINAL_SUBCOMMANDS = {"build_py", "build_clib", "build_ext", "build_scripts"}
 
 

setuptools/command/dist_info.py

@@ -5,7 +5,6 @@
 
 import os
 import shutil
-import sys
 from contextlib import contextmanager
 from distutils import log
 from distutils.core import Command
@@ -77,7 +76,7 @@ def _maybe_bkp_dir(self, dir_path: str, requires_bkp: bool):
         if requires_bkp:
             bkp_name = f"{dir_path}.__bkp__"
             _rm(bkp_name, ignore_errors=True)
-            _copy(dir_path, bkp_name, dirs_exist_ok=True, symlinks=True)
+            shutil.copytree(dir_path, bkp_name, dirs_exist_ok=True, symlinks=True)
             try:
                 yield
             finally:
@@ -103,9 +102,3 @@ def run(self):
 def _rm(dir_name, **opts):
     if os.path.isdir(dir_name):
         shutil.rmtree(dir_name, **opts)
-
-
-def _copy(src, dst, **opts):
-    if sys.version_info < (3, 8):
-        opts.pop("dirs_exist_ok", None)
-    shutil.copytree(src, dst, **opts)

setuptools/command/easy_install.py

@@ -250,12 +250,13 @@ def finalize_options(self):  # noqa: C901  # is too complex (25)  # FIXME
             'dist_version': self.distribution.get_version(),
             'dist_fullname': self.distribution.get_fullname(),
             'py_version': py_version,
-            'py_version_short': (f'{sys.version_info.major}.{sys.version_info.minor}'),
+            'py_version_short': f'{sys.version_info.major}.{sys.version_info.minor}',
             'py_version_nodot': f'{sys.version_info.major}{sys.version_info.minor}',
             'sys_prefix': self.config_vars['prefix'],
             'sys_exec_prefix': self.config_vars['exec_prefix'],
-            # Only python 3.2+ has abiflags
+            # Only POSIX systems have abiflags
             'abiflags': getattr(sys, 'abiflags', ''),
+            # Only python 3.9+ has platlibdir
             'platlibdir': getattr(sys, 'platlibdir', 'lib'),
         })
         with contextlib.suppress(AttributeError):

setuptools/command/editable_wheel.py

@@ -30,6 +30,7 @@
     List,
     Mapping,
     Optional,
+    Protocol,
     Tuple,
     TypeVar,
     Union,
@@ -54,13 +55,6 @@
 if TYPE_CHECKING:
     from wheel.wheelfile import WheelFile  # noqa
 
-if sys.version_info >= (3, 8):
-    from typing import Protocol
-elif TYPE_CHECKING:
-    from typing_extensions import Protocol
-else:
-    from abc import ABC as Protocol
-
 _Path = Union[str, Path]
 _P = TypeVar("_P", bound=_Path)
 _logger = logging.getLogger(__name__)

setuptools/command/sdist.py

@@ -1,7 +1,6 @@
 from distutils import log
 import distutils.command.sdist as orig
 import os
-import sys
 import contextlib
 from itertools import chain
 
@@ -71,14 +70,6 @@ def run(self):
     def initialize_options(self):
         orig.sdist.initialize_options(self)
 
-        self._default_to_gztar()
-
-    def _default_to_gztar(self):
-        # only needed on Python prior to 3.6.
-        if sys.version_info >= (3, 6, 0, 'beta', 1):
-            return
-        self.formats = ['gztar']
-
     def make_distribution(self):
         """
         Workaround for #516

setuptools/monkey.py

@@ -66,21 +66,6 @@ def patch_all():
     # we can't patch distutils.cmd, alas
     distutils.core.Command = setuptools.Command
 
-    has_issue_12885 = sys.version_info <= (3, 5, 3)
-
-    if has_issue_12885:
-        # fix findall bug in distutils (https://bugs.python.org/issue12885)
-        distutils.filelist.findall = setuptools.findall
-
-    needs_warehouse = (3, 4) < sys.version_info < (3, 4, 6) or (
-        3,
-        5,
-    ) < sys.version_info <= (3, 5, 3)
-
-    if needs_warehouse:
-        warehouse = 'https://upload.pypi.org/legacy/'
-        distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
-
     _patch_distribution_metadata()
 
     # Install Distribution throughout the distutils
@@ -138,8 +123,7 @@ def patch_for_msvc_specialized_compiler():
     Patch functions in distutils to use standalone Microsoft Visual C++
     compilers.
     """
-    # import late to avoid circular imports on Python < 3.5
-    msvc = import_module('setuptools.msvc')
+    from . import msvc
 
     if platform.system() != 'Windows':
         # Compilers only available on Microsoft Windows

setuptools/namespaces.py

@@ -42,12 +42,11 @@ def _get_target(self):
 
     _nspkg_tmpl = (
         "import sys, types, os",
-        "has_mfs = sys.version_info > (3, 5)",
         "p = os.path.join(%(root)s, *%(pth)r)",
-        "importlib = has_mfs and __import__('importlib.util')",
-        "has_mfs and __import__('importlib.machinery')",
+        "importlib = __import__('importlib.util')",
+        "__import__('importlib.machinery')",
         (
-            "m = has_mfs and "
+            "m = "
             "sys.modules.setdefault(%(pkg)r, "
             "importlib.util.module_from_spec("
             "importlib.machinery.PathFinder.find_spec(%(pkg)r, "