Skip to content

[3.9] bpo-40924: Remove protocol for supplying Traversable objects from loaders #20820

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
ambv merged 2 commits into from
Jun 14, 2020
Merged

[3.9] bpo-40924: Remove protocol for supplying Traversable objects from loaders #20820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f34b8d9
bpo-40924: Remove protocol that loaders can present a files method as…
jaraco Jun 11, 2020
89eaf60
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 11, 2020
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
3 changes: 0 additions & 3 deletions Doc/library/importlib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,9 +813,6 @@ ABC hierarchy::
methods. Therefore, any loader supplying TraversableReader
also supplies ResourceReader.

Loaders that wish to support resource reading are expected to
implement this interface.

.. versionadded:: 3.9


Expand Down
12 changes: 1 addition & 11 deletions Lib/importlib/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@ def from_package(package):
Return a Traversable object for the given package.

"""
spec = package.__spec__
return from_traversable_resources(spec) or fallback_resources(spec)


def from_traversable_resources(spec):
"""
If the spec.loader implements TraversableResources,
directly or implicitly, it will have a ``files()`` method.
"""
with contextlib.suppress(AttributeError):
return spec.loader.files()
return fallback_resources(package.__spec__)


def fallback_resources(spec):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-06-11-23-41-50.bpo-40924.m17Fkm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Removed support for loaders implementing .files and supplying TraversableResources.