Remove py38 compat modules

Author: Avasam

conftest.py

@@ -48,7 +48,7 @@ def _save_cwd():
 
 @pytest.fixture
 def distutils_managed_tempdir(request):
-    from distutils.tests.compat import py38 as os_helper
+    from distutils.tests.compat import py39 as os_helper
 
     self = request.instance
     self.tempdirs = []

distutils/compat/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from .py38 import removeprefix
-
 
 def consolidate_linker_args(args: list[str]) -> list[str] | str:
     """
@@ -12,4 +10,4 @@ def consolidate_linker_args(args: list[str]) -> list[str] | str:
 
     if not all(arg.startswith('-Wl,') for arg in args):
         return args
-    return '-Wl,' + ','.join(removeprefix(arg, '-Wl,') for arg in args)
+    return '-Wl,' + ','.join(arg.removeprefix('-Wl,') for arg in args)

distutils/compat/py38.py

@@ -0,0 +1,22 @@
+import sys
+
+if sys.version_info >= (3, 10):
+    from test.support.import_helper import (
+        CleanImport as CleanImport,
+        DirsOnSysPath as DirsOnSysPath,
+    )
+    from test.support.os_helper import (
+        EnvironmentVarGuard as EnvironmentVarGuard,
+        rmtree as rmtree,
+        skip_unless_symlink as skip_unless_symlink,
+        unlink as unlink,
+    )
+else:
+    from test.support import (
+        CleanImport as CleanImport,
+        DirsOnSysPath as DirsOnSysPath,
+        EnvironmentVarGuard as EnvironmentVarGuard,
+        rmtree as rmtree,
+        skip_unless_symlink as skip_unless_symlink,
+        unlink as unlink,
+    )

distutils/tests/compat/py38.py

@@ -8,8 +8,7 @@
 from distutils.tests import support
 
 import pytest
-
-from .compat.py38 import requires_zlib
+from test.support import requires_zlib
 
 SETUP_PY = """\
 from distutils.core import setup

distutils/tests/compat/py39.py

@@ -19,19 +19,15 @@
 )
 from distutils.extension import Extension
 from distutils.tests import missing_compiler_executable
-from distutils.tests.support import (
-    TempdirManager,
-    copy_xxmodule_c,
-    fixup_build_ext,
-)
+from distutils.tests.support import TempdirManager, copy_xxmodule_c, fixup_build_ext
 from io import StringIO
 
 import jaraco.path
 import path
 import pytest
 from test import support
 
-from .compat import py38 as import_helper
+from .compat import py39 as import_helper
 
 
 @pytest.fixture()

distutils/tests/test_bdist_rpm.py

@@ -6,8 +6,7 @@
 from distutils.extension import Extension, read_setup_file
 
 import pytest
-
-from .compat.py38 import check_warnings
+from test.support.warnings_helper import check_warnings
 
 
 class TestExtension:

distutils/tests/test_build_ext.py

@@ -10,7 +10,7 @@
 import jaraco.path
 import pytest
 
-from .compat import py38 as os_helper
+from .compat import py39 as os_helper
 
 MANIFEST_IN = """\
 include ok

distutils/tests/test_extension.py

@@ -12,7 +12,7 @@
 import pytest
 from test.support import unix_shell
 
-from .compat import py38 as os_helper
+from .compat import py39 as os_helper
 
 
 class TestSpawn(support.TempdirManager):

distutils/tests/test_filelist.py

@@ -12,7 +12,7 @@
 import pytest
 
 from . import support
-from .compat.py38 import EnvironmentVarGuard
+from .compat.py39 import EnvironmentVarGuard
 
 
 @pytest.fixture(autouse=True)

distutils/tests/test_spawn.py

@@ -25,7 +25,7 @@
 from .spawn import spawn
 
 
-def get_host_platform():
+def get_host_platform() -> str:
     """
     Return a string that identifies the current platform. Use this
     function to distinguish platform-specific build directories and
@@ -34,15 +34,7 @@ def get_host_platform():
 
     # This function initially exposed platforms as defined in Python 3.9
     # even with older Python versions when distutils was split out.
-    # Now it delegates to stdlib sysconfig, but maintains compatibility.
-
-    if sys.version_info < (3, 9):
-        if os.name == "posix" and hasattr(os, 'uname'):
-            osname, host, release, version, machine = os.uname()
-            if osname[:3] == "aix":
-                from .compat.py38 import aix_platform
-
-                return aix_platform(osname, version, release)
+    # Now it delegates to stdlib sysconfig.
 
     return sysconfig.get_platform()
 

distutils/tests/test_unixccompiler.py

@@ -47,6 +47,10 @@ ignore = [
 	"TRY400",
 ]
 
+[lint.isort]
+combine-as-imports = true
+split-on-trailing-comma = false
+
 [format]
 # Enable preview to get hugged parenthesis unwrapping and other nice surprises
 # See https://github.com/jaraco/skeleton/pull/133#issuecomment-2239538373