Separate match resolution from recursive join.

jaraco · web-flow · commit 779f59ef3d0b · 2022-06-15T20:36:10.000-04:00
diff --git a/importlib_resources/abc.py b/importlib_resources/abc.py
@@ -116,11 +116,12 @@ def joinpath(self, *descendants: StrPath) -> "Traversable":
             traversable for traversable in self.iterdir() if traversable.name == target
         )
         try:
-            return next(matches).joinpath(*names)
+            match = next(matches)
         except StopIteration:
             raise TraversalError(
                 "Target not found during traversal.", target, list(names)
             )
+        return match.joinpath(*names)
 
     def __truediv__(self, child: StrPath) -> "Traversable":
         """

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,12 @@ def joinpath(self, *descendants: StrPath) -> "Traversable":`
`116`	`116`	`traversable for traversable in self.iterdir() if traversable.name == target`
`117`	`117`	`)`
`118`	`118`	`try:`
`119`		`- return next(matches).joinpath(*names)`
	`119`	`+ match = next(matches)`
`120`	`120`	`except StopIteration:`
`121`	`121`	`raise TraversalError(`
`122`	`122`	`"Target not found during traversal.", target, list(names)`
`123`	`123`	`)`
	`124`	`+ return match.joinpath(*names)`
`124`	`125`
`125`	`126`	`def __truediv__(self, child: StrPath) -> "Traversable":`
`126`	`127`	`"""`