Remove py38 compat modules

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 test.support import 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/tests/test_bdist_rpm.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/test_build_ext.py

@@ -30,8 +30,7 @@
 import path
 import pytest
 from test import support
-
-from .compat import py38 as import_helper
+from test.support import import_helper
 
 
 @pytest.fixture()

distutils/tests/test_extension.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_filelist.py

@@ -9,8 +9,7 @@
 
 import jaraco.path
 import pytest
-
-from .compat import py38 as os_helper
+from test.support import os_helper
 
 MANIFEST_IN = """\
 include ok

distutils/tests/test_spawn.py

@@ -10,9 +10,7 @@
 
 import path
 import pytest
-from test.support import unix_shell
-
-from .compat import py38 as os_helper
+from test.support import os_helper, unix_shell
 
 
 class TestSpawn(support.TempdirManager):
@@ -73,9 +71,12 @@ def test_find_executable(self, tmp_path):
         # PATH='': no match, except in the current directory
         with os_helper.EnvironmentVarGuard() as env:
             env['PATH'] = ''
-            with mock.patch(
-                'distutils.spawn.os.confstr', return_value=tmp_dir, create=True
-            ), mock.patch('distutils.spawn.os.defpath', tmp_dir):
+            with (
+                mock.patch(
+                    'distutils.spawn.os.confstr', return_value=tmp_dir, create=True
+                ),
+                mock.patch('distutils.spawn.os.defpath', tmp_dir),
+            ):
                 rv = find_executable(program)
                 assert rv is None
 
@@ -87,9 +88,10 @@ def test_find_executable(self, tmp_path):
         # PATH=':': explicitly looks in the current directory
         with os_helper.EnvironmentVarGuard() as env:
             env['PATH'] = os.pathsep
-            with mock.patch(
-                'distutils.spawn.os.confstr', return_value='', create=True
-            ), mock.patch('distutils.spawn.os.defpath', ''):
+            with (
+                mock.patch('distutils.spawn.os.confstr', return_value='', create=True),
+                mock.patch('distutils.spawn.os.defpath', ''),
+            ):
                 rv = find_executable(program)
                 assert rv is None
 
@@ -103,16 +105,22 @@ def test_find_executable(self, tmp_path):
             env.pop('PATH', None)
 
             # without confstr
-            with mock.patch(
-                'distutils.spawn.os.confstr', side_effect=ValueError, create=True
-            ), mock.patch('distutils.spawn.os.defpath', tmp_dir):
+            with (
+                mock.patch(
+                    'distutils.spawn.os.confstr', side_effect=ValueError, create=True
+                ),
+                mock.patch('distutils.spawn.os.defpath', tmp_dir),
+            ):
                 rv = find_executable(program)
                 assert rv == filename
 
             # with confstr
-            with mock.patch(
-                'distutils.spawn.os.confstr', return_value=tmp_dir, create=True
-            ), mock.patch('distutils.spawn.os.defpath', ''):
+            with (
+                mock.patch(
+                    'distutils.spawn.os.confstr', return_value=tmp_dir, create=True
+                ),
+                mock.patch('distutils.spawn.os.defpath', ''),
+            ):
                 rv = find_executable(program)
                 assert rv == filename
 

distutils/tests/test_unixccompiler.py

@@ -10,9 +10,9 @@
 from distutils.util import _clear_cached_macosx_ver
 
 import pytest
+from test.support.os_helper import EnvironmentVarGuard
 
 from . import support
-from .compat.py38 import EnvironmentVarGuard
 
 
 @pytest.fixture(autouse=True)
@@ -272,13 +272,12 @@ def gcvs(*args, _orig=sysconfig.get_config_vars):
 
         sysconfig.get_config_var = gcv
         sysconfig.get_config_vars = gcvs
-        with mock.patch.object(
-            self.cc, 'spawn', return_value=None
-        ) as mock_spawn, mock.patch.object(
-            self.cc, '_need_link', return_value=True
-        ), mock.patch.object(
-            self.cc, 'mkpath', return_value=None
-        ), EnvironmentVarGuard() as env:
+        with (
+            mock.patch.object(self.cc, 'spawn', return_value=None) as mock_spawn,
+            mock.patch.object(self.cc, '_need_link', return_value=True),
+            mock.patch.object(self.cc, 'mkpath', return_value=None),
+            EnvironmentVarGuard() as env,
+        ):
             env['CC'] = 'ccache my_cc'
             env['CXX'] = 'my_cxx'
             del env['LDSHARED']

distutils/util.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()