11
11
from .. import readers , _adapters
12
12
13
13
14
- class TraversableResourcesLoader :
14
+ class TraversableResourcesLoader ( _adapters . TraversableResourcesLoader ) :
15
15
"""
16
16
Adapt loaders to provide TraversableResources and other
17
17
compatibility.
@@ -20,9 +20,6 @@ class TraversableResourcesLoader:
20
20
loaders do not yet implement TraversableResources.
21
21
"""
22
22
23
- def __init__ (self , spec ):
24
- self .spec = spec
25
-
26
23
@property
27
24
def path (self ):
28
25
return self .spec .origin
@@ -36,14 +33,6 @@ def _namespace_reader(spec):
36
33
with suppress (AttributeError , ValueError ):
37
34
return readers .NamespaceReader (spec .submodule_search_locations )
38
35
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
-
47
36
def _file_reader (spec ):
48
37
try :
49
38
path = pathlib .Path (self .path )
@@ -62,11 +51,8 @@ def _file_reader(spec):
62
51
# local FileReader
63
52
_file_reader (self .spec )
64
53
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 )
70
56
)
71
57
72
58
0 commit comments