python
diff --git a/‎importlib_resources/_common.py
Copy file name to clipboardExpand all lines: importlib_resources/_common.py
+3-24Lines changed: 3 additions & 24 deletions b/‎importlib_resources/_common.py
Copy file name to clipboardExpand all lines: importlib_resources/_common.py
+3-24Lines changed: 3 additions & 24 deletions
diff --git a/‎importlib_resources/_compat.py
Copy file name to clipboardExpand all lines: importlib_resources/_compat.py
+33-7Lines changed: 33 additions & 7 deletions b/‎importlib_resources/_compat.py
Copy file name to clipboardExpand all lines: importlib_resources/_compat.py
+33-7Lines changed: 33 additions & 7 deletions
diff --git a/‎importlib_resources/readers.py
Copy file name to clipboardExpand all lines: importlib_resources/readers.py
+6-6Lines changed: 6 additions & 6 deletions b/‎importlib_resources/readers.py
Copy file name to clipboardExpand all lines: importlib_resources/readers.py
+6-6Lines changed: 6 additions & 6 deletions
@@ -5,8 +5,8 @@
 import contextlib
 
 from ._compat import (
-    Path, package_spec, FileNotFoundError, ZipPath,
-    singledispatch, suppress,
+    Path, FileNotFoundError,
+    singledispatch, traversable_reader,
     )
 
 
@@ -15,28 +15,7 @@ def from_package(package):
     Return a Traversable object for the given package.
 
     """
-    spec = package_spec(package)
-    return from_traversable_resources(spec) or fallback_resources(spec)
-
-
-def from_traversable_resources(spec):
-    """
-    If the spec.loader implements TraversableResources,
-    directly or implicitly, it will have a ``files()`` method.
-    """
-    with suppress(AttributeError):
-        return spec.loader.files()
-
-
-def fallback_resources(spec):
-    package_directory = Path(spec.origin).parent
-    try:
-        archive_path = spec.loader.archive
-        rel_path = package_directory.relative_to(archive_path)
-        return ZipPath(archive_path, str(rel_path) + '/')
-    except Exception:
-        pass
-    return package_directory
+    return traversable_reader(package).files()
 
 
 @contextlib.contextmanager
 
@@ -61,13 +61,39 @@ def runtime_checkable(cls):  # type: ignore
 
 
 class PackageSpec(object):
-	def __init__(self, **kwargs):
-		vars(self).update(kwargs)
+    def __init__(self, **kwargs):
+        vars(self).update(kwargs)
 
 
 def package_spec(package):
-	return getattr(package, '__spec__', None) or \
-		PackageSpec(
-			origin=package.__file__,
-			loader=getattr(package, '__loader__', None),
-		)
+    """
+    Construct a minimal package spec suitable for
+    matching the interfaces this library relies upon
+    in later Python versions.
+    """
+    return getattr(package, '__spec__', None) or \
+        PackageSpec(
+            origin=package.__file__,
+            loader=getattr(package, '__loader__', None),
+            name=package.__name__,
+        )
+
+
+def traversable_reader(package):
+    """
+    For a given package, ensure a TraversableResources.
+    """
+    from . import readers
+    try:
+        spec = package_spec(package)
+        reader = spec.loader.get_resource_reader(spec.name)
+        reader.files
+    except AttributeError:
+        reader = _zip_reader(spec) or readers.FileReader(spec)
+    return reader
+
+
+def _zip_reader(spec):
+    from . import readers
+    with suppress(AttributeError):
+        return readers.ZipReader(spec)
@@ -4,18 +4,18 @@
 
 
 class FileReader(abc.TraversableResources):
-    def __init__(self, loader):
-        self.path = Path(loader.path).parent
+    def __init__(self, spec):
+        self.path = Path(spec.origin).parent
 
     def files(self):
         return self.path
 
 
 class ZipReader(FileReader):
-    def __init__(self, loader, module):
-        _, _, name = module.rpartition('.')
-        prefix = loader.prefix.replace('\\', '/') + name + '/'
-        self.path = ZipPath(loader.archive, prefix)
+    def __init__(self, spec):
+        _, _, name = spec.name.rpartition('.')
+        prefix = spec.loader.prefix.replace('\\', '/') + name + '/'
+        self.path = ZipPath(spec.loader.archive, prefix)
 
     def open_resource(self, resource):
         try: