Skip to content

Commit 115ca5d

Browse files
committed
Move reader constructors into methods.
1 parent beb5011 commit 115ca5d

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

importlib_resources/future/adapters.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@ class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
2020
over stdlib readers.
2121
"""
2222

23-
@property
24-
def path(self):
25-
return self.spec.origin
26-
2723
def get_resource_reader(self, name):
28-
def _zip_reader(spec):
29-
with suppress(AttributeError):
30-
return readers.ZipReader(spec.loader, spec.name)
31-
32-
def _namespace_reader(spec):
33-
with suppress(AttributeError, ValueError):
34-
return readers.NamespaceReader(spec.submodule_search_locations)
35-
36-
def _file_reader(spec):
37-
try:
38-
path = pathlib.Path(self.path)
39-
except TypeError:
40-
return None
41-
if path.exists():
42-
return readers.FileReader(self)
43-
4424
return (
4525
# local ZipReader if a zip module
46-
_zip_reader(self.spec)
26+
self._zip_reader()
4727
or
4828
# local NamespaceReader if a namespace module
49-
_namespace_reader(self.spec)
29+
self._namespace_reader()
5030
or
5131
# local FileReader
52-
_file_reader(self.spec)
32+
self._file_reader()
5333
or
5434
# fallback
5535
super().get_resource_reader(name)
5636
)
5737

38+
@property
39+
def path(self):
40+
return self.spec.origin
41+
42+
def _zip_reader(self):
43+
with suppress(AttributeError):
44+
return readers.ZipReader(self.spec.loader, self.spec.name)
45+
46+
def _namespace_reader(self):
47+
with suppress(AttributeError, ValueError):
48+
return readers.NamespaceReader(self.spec.submodule_search_locations)
49+
50+
def _file_reader(self):
51+
try:
52+
path = pathlib.Path(self.path)
53+
except TypeError:
54+
return None
55+
if path.exists():
56+
return readers.FileReader(self)
57+
5858

5959
def wrap_spec(package):
6060
"""

0 commit comments

Comments
 (0)