Remove compatibility for Python 3.5 in tests.

pypa · Jun 6, 2022 · 32f0b82 · 32f0b82
1 parent dc3909b
commit 32f0b82
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 89 deletions.
diff --git a/distutils/tests/py35compat.py b/distutils/tests/py35compat.py
diff --git a/distutils/tests/test_build_clib.py b/distutils/tests/test_build_clib.py
@@ -3,9 +3,7 @@
 import os
 import sys
 
-from test.support import run_unittest
-
-from .py35compat import missing_compiler_executable
+from test.support import run_unittest, missing_compiler_executable
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError

diff --git a/distutils/tests/test_config_cmd.py b/distutils/tests/test_config_cmd.py
@@ -2,9 +2,7 @@
 import unittest
 import os
 import sys
-from test.support import run_unittest
-
-from .py35compat import missing_compiler_executable
+from test.support import run_unittest, missing_compiler_executable
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support

diff --git a/distutils/tests/test_filelist.py b/distutils/tests/test_filelist.py
@@ -11,7 +11,6 @@
 from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
-from .py35compat import adapt_glob
 from . import py38compat as os_helper
 
 
@@ -62,7 +61,7 @@ def test_glob_to_re(self):
             (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z'),
         ):
             regex = regex % {'sep': sep}
-            self.assertEqual(glob_to_re(glob), adapt_glob(regex))
+            self.assertEqual(glob_to_re(glob), regex)
 
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns

diff --git a/distutils/tests/test_spawn.py b/distutils/tests/test_spawn.py
@@ -3,9 +3,8 @@
 import stat
 import sys
 import unittest.mock
-from test.support import run_unittest
+from test.support import run_unittest, unix_shell
 
-from .py35compat import unix_shell
 from . import py38compat as os_helper
 
 from distutils.spawn import find_executable