Skip to content

Commit 8b10d7e

Browse files
committed
Consolidate more shared behavior across TraversableResourceLoaders.
1 parent be65d3d commit 8b10d7e

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

importlib_resources/future/adapters.py

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from .. import readers, _adapters
1212

1313

14-
class TraversableResourcesLoader:
14+
class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
1515
"""
1616
Adapt loaders to provide TraversableResources and other
1717
compatibility.
@@ -20,9 +20,6 @@ class TraversableResourcesLoader:
2020
loaders do not yet implement TraversableResources.
2121
"""
2222

23-
def __init__(self, spec):
24-
self.spec = spec
25-
2623
@property
2724
def path(self):
2825
return self.spec.origin
@@ -36,14 +33,6 @@ def _namespace_reader(spec):
3633
with suppress(AttributeError, ValueError):
3734
return readers.NamespaceReader(spec.submodule_search_locations)
3835

39-
def _available_reader(spec):
40-
with suppress(AttributeError):
41-
return spec.loader.get_resource_reader(spec.name)
42-
43-
def _native_reader(spec):
44-
reader = _available_reader(spec)
45-
return reader if hasattr(reader, 'files') else None
46-
4736
def _file_reader(spec):
4837
try:
4938
path = pathlib.Path(self.path)
@@ -62,11 +51,8 @@ def _file_reader(spec):
6251
# local FileReader
6352
_file_reader(self.spec)
6453
or
65-
# native reader if it supplies 'files'
66-
_native_reader(self.spec)
67-
or
68-
# fallback - adapt the spec ResourceReader to TraversableReader
69-
_adapters.CompatibilityFiles(self.spec)
54+
# fallback
55+
super().get_resource_reader(name)
7056
)
7157

7258

0 commit comments

Comments
 (0)