-
-
Notifications
You must be signed in to change notification settings - Fork 30.1k
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.
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
bpo-21720: Restore the Python 2.7 logic in handling a fromlist. #4118
Merged
serhiy-storchaka
merged 5 commits into
python:master
from
serhiy-storchaka:import-fromlist-check-type
Oct 26, 2017
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f54d8d0
bpo-21720: Restore the Python 2.7 logic in handling a fromlist.
serhiy-storchaka d573212
Move the test to more appropriate place.
serhiy-storchaka 90c53ea
Add BytesWarnings checks.
serhiy-storchaka 08cd34a
Improve error message for invalid type in __all__.
serhiy-storchaka accf4b8
Minor style fixes.
serhiy-storchaka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -994,7 +994,7 @@ def _gcd_import(name, package=None, level=0): | |
return _find_and_load(name, _gcd_import) | ||
|
||
|
||
def _handle_fromlist(module, fromlist, import_): | ||
def _handle_fromlist(module, fromlist, import_, recursive=False): | ||
"""Figure out what __import__ should return. | ||
|
||
The import_ parameter is a callable which takes the name of module to | ||
|
@@ -1005,13 +1005,19 @@ def _handle_fromlist(module, fromlist, import_): | |
# The hell that is fromlist ... | ||
# If a package was imported, try to import stuff from fromlist. | ||
if hasattr(module, '__path__'): | ||
if '*' in fromlist: | ||
fromlist = list(fromlist) | ||
fromlist.remove('*') | ||
if hasattr(module, '__all__'): | ||
fromlist.extend(module.__all__) | ||
for x in fromlist: | ||
if not hasattr(module, x): | ||
if not isinstance(x, str): | ||
if recursive: | ||
where = module.__name__ + '.__all__' | ||
else: | ||
where = "``from list''" | ||
raise TypeError(f"Item in {where} must be str, " | ||
f"not {type(x).__name__}") | ||
if x == '*': | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
if not recursive and hasattr(module, '__all__'): | ||
_handle_fromlist(module, module.__all__, import_, True) | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Extraneous blank line. |
||
elif not hasattr(module, x): | ||
from_name = '{}.{}'.format(module.__name__, x) | ||
try: | ||
_call_with_frames_removed(import_, from_name) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Core and Builtins/2017-10-25-15-51-37.bpo-21720.BwIKLP.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BytesWarning no longer emitted when the *fromlist* argument of | ||
``__import__()`` or the ``__all__`` attribute of the module contain bytes | ||
instances. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
recursive
should probably be keyword-only, else it's ambiguous what_handle_fromlist(..., False)
means.