Skip to content

Re-use joinpath logic in Traversable and MultiplexedPath #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 9 commits into from
Jun 16, 2022
+40 −24
Merged

Re-use joinpath logic in Traversable and MultiplexedPath #250

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e396423
Inline the flattening of descendants.
jaraco Apr 17, 2022
df36958
Move ResourceContainer.joinpath to Traversable.joinpath, providing a …
jaraco Apr 17, 2022
b923ce2
Refactor to converge descendants to a single type and rely on Path.pa…
jaraco Apr 17, 2022
c3cefa6
Replace StopIteration with a TraversalError for use in capturing a fa…
jaraco Apr 17, 2022
6440323
In readers.MultiplexedPath, re-use Traversable.joinpath.
jaraco Apr 17, 2022
075b6ce
Add test for empty joinpath.
jaraco Apr 18, 2022
0140430
Leave this behavior uncovered.
jaraco Apr 18, 2022
643caba
Separate match resolution from recursive join.
jaraco Jun 16, 2022
1def9a2
Update changelog
jaraco Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
In readers.MultiplexedPath, re-use Traversable.joinpath.
  • Loading branch information
@jaraco
jaraco committed Jun 16, 2022
commit 64403234fdbc3b9df60a57ff1ee76778a03a83b4
19 changes: 10 additions & 9 deletions importlib_resources/readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,16 @@ def is_dir(self):
def is_file(self):
return False

def joinpath(self, child):
# first try to find child in current paths
for file in self.iterdir():
if file.name == child:
return file
# if it does not exist, construct it with the first path
return self._paths[0] / child

__truediv__ = joinpath
def joinpath(self, *descendants):
try:
return super().joinpath(*descendants)
except abc.TraversalError as exc:
# One of the paths didn't resolve.
msg, target, names = exc.args
if names:
raise
# It was the last; construct result with the first path.
return self._paths[0].joinpath(target)

def open(self, *args, **kwargs):
raise FileNotFoundError(f'{self} is not a file')
Expand Down