Ensure stdlib readers are excluded on Python 3.10 even when found in importlib.readers. Closes #257.

jaraco · jaraco · commit d9e44b65dfb6 · 2024-03-16T11:01:33.000-04:00
diff --git a/importlib_resources/future/adapters.py b/importlib_resources/future/adapters.py
@@ -24,7 +24,8 @@ def wrapper(*args, **kwargs):
             # MultiplexedPath may fail on zip subdirectory
             return
         # Python 3.10+
-        if reader.__class__.__module__.startswith('importlib.resources.'):
+        mod_name = reader.__class__.__module__
+        if mod_name.startswith('importlib.') and mod_name.endswith('readers'):
             return
         # Python 3.8, 3.9
         if isinstance(reader, _adapters.CompatibilityFiles) and (
diff --git a/importlib_resources/tests/test_files.py b/importlib_resources/tests/test_files.py
@@ -4,8 +4,6 @@
 import importlib
 import contextlib
 
-import pytest
-
 import importlib_resources as resources
 from ..abc import Traversable
 from . import data01
@@ -36,7 +34,6 @@ def test_read_text(self):
     def test_traversable(self):
         assert isinstance(resources.files(self.data), Traversable)
 
-    @pytest.mark.xfail("sys.version_info[:2] == (3, 10)", reason="#257")
     def test_joinpath_with_multiple_args(self):
         files = resources.files(self.data)
         binfile = files.joinpath('subdirectory', 'binary.file')
