Skip to content
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

Jump to bottom

Restore precedence of standard readers over degenerate readers #302

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Restore precedence of standard readers over degenerate readers #302

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c3f294
When blocking stdlib readers, avoid giving deference to degenerate re…
jaraco Mar 19, 2024
cee77e8
Add news fragment.
jaraco Mar 19, 2024
0f8aa5f
Add reference to the issue in the docstring.
jaraco Mar 19, 2024
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
13 changes: 12 additions & 1 deletion importlib_resources/future/adapters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ def wrapper(*args, **kwargs):
return wrapper


def _skip_degenerate(reader):
"""
Mask any degenerate reader.
"""
is_degenerate = (
isinstance(reader, _adapters.CompatibilityFiles) and not reader._reader
)
return reader if not is_degenerate else None


class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
"""
Adapt loaders to provide TraversableResources and other
Expand All @@ -51,8 +61,9 @@ class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):

def get_resource_reader(self, name):
return (
_block_standard(super().get_resource_reader)(name)
_skip_degenerate(_block_standard(super().get_resource_reader)(name))
or self._standard_reader()
or super().get_resource_reader(name)
)

def _standard_reader(self):
Expand Down
1 change: 1 addition & 0 deletions newsfragments/298.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Restored expectation that local standard readers are preferred over degenerate readers.
Loading