Revert changes in Readers for b85f74a. Upstream needs this interface.

Author: jaraco

importlib_resources/_compat.py

@@ -71,34 +71,40 @@ def __init__(self, **kwargs):
 class TraversableResourcesAdapter:
     def __init__(self, spec):
         self.spec = spec
-        self.loader = LoaderAdapter(self.spec)
+        self.loader = LoaderAdapter(spec)
 
     def __getattr__(self, name):
         return getattr(self.spec, name)
 
 
 class LoaderAdapter:
     """
-    Adapt loaders on Python < 3.9 to provide TraversableResources
-    readers.
+    Adapt loaders to provide TraversableResources and other
+    compatibility.
     """
     def __init__(self, spec):
         self.spec = spec
 
+    @property
+    def path(self):
+        # Python < 3
+        return self.spec.origin
+
     def get_resource_reader(self, name):
+        # Python < 3.9
         from . import readers
         try:
             reader = self.spec.loader.get_resource_reader(name)
             reader.files
         except AttributeError:
-            reader = _zip_reader(self.spec) or readers.FileReader(self.spec)
+            reader = _zip_reader(self.spec) or readers.FileReader(self)
         return reader
 
 
 def _zip_reader(spec):
     from . import readers
     with suppress(AttributeError):
-        return readers.ZipReader(spec)
+        return readers.ZipReader(spec.loader, spec.name)
 
 
 def package_spec(package):

importlib_resources/readers.py

@@ -4,18 +4,18 @@
 
 
 class FileReader(abc.TraversableResources):
-    def __init__(self, spec):
-        self.path = Path(spec.origin).parent
+    def __init__(self, loader):
+        self.path = Path(loader.path).parent
 
     def files(self):
         return self.path
 
 
 class ZipReader(FileReader):
-    def __init__(self, spec):
-        _, _, name = spec.name.rpartition('.')
-        prefix = spec.loader.prefix.replace('\\', '/') + name + '/'
-        self.path = ZipPath(spec.loader.archive, prefix)
+    def __init__(self, loader, module):
+        _, _, name = module.rpartition('.')
+        prefix = loader.prefix.replace('\\', '/') + name + '/'
+        self.path = ZipPath(loader.archive, prefix)
 
     def open_resource(self, resource):
         try: