Move test compatibility modules into a compat package.

python · Mar 6, 2024 · aa1df53 · aa1df53
1 parent 131906a
commit aa1df53
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/importlib_resources/tests/compat/__init__.py b/importlib_resources/tests/compat/__init__.py
diff --git a/importlib_resources/tests/_compat.py → importlib_resources/tests/compat/py39.py b/importlib_resources/tests/_compat.py → importlib_resources/tests/compat/py39.py
@@ -1,10 +1,13 @@
+"""
+Backward-compatability shims to support Python 3.9 and earlier.
+"""
+
 import os
 
 
 try:
     from test.support import import_helper  # type: ignore
 except ImportError:
-    # Python 3.9 and earlier
     class import_helper:  # type: ignore
         from test.support import (
             modules_setup,
@@ -17,13 +20,11 @@ class import_helper:  # type: ignore
 try:
     from test.support import os_helper  # type: ignore
 except ImportError:
-    # Python 3.9 compat
     class os_helper:  # type:ignore
         from test.support import temp_dir
 
 
 try:
-    # Python 3.10
     from test.support.os_helper import unlink
 except ImportError:
     from test.support import unlink as _unlink

diff --git a/importlib_resources/tests/test_custom.py b/importlib_resources/tests/test_custom.py
@@ -6,7 +6,7 @@
 from .. import abc
 from ..abc import TraversableResources, ResourceReader
 from . import util
-from ._compat import os_helper
+from .compat.py39 import os_helper
 
 
 class SimpleLoader:

diff --git a/importlib_resources/tests/test_files.py b/importlib_resources/tests/test_files.py
@@ -9,7 +9,7 @@
 from . import data01
 from . import util
 from . import _path
-from ._compat import os_helper, import_helper
+from .compat.py39 import os_helper, import_helper
 
 
 @contextlib.contextmanager

diff --git a/importlib_resources/tests/util.py b/importlib_resources/tests/util.py
@@ -8,7 +8,7 @@
 
 from . import data01
 from ..abc import ResourceReader
-from ._compat import import_helper, os_helper
+from .compat.py39 import import_helper, os_helper
 from . import zip as zip_