mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Close #15425: Eliminate more importlib related traceback noise

Browse source
This commit is contained in:
Nick Coghlan 2012-07-29 20:30:36 +10:00
parent bb9b1c165d
commit 5ee9892406
5 changed files with 4275 additions and 4150 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/importlib/_bootstrap.py
View file

@ -1472,7 +1472,7 @@ def _find_and_load_unlocked(name, import_):
parent = name.rpartition('.')[0]
if parent:
if parent not in sys.modules:
import_(parent)
_recursive_import(import_, parent)
# Crazy side-effects!
if name in sys.modules:
return sys.modules[name]
@ -1550,6 +1550,12 @@ def _gcd_import(name, package=None, level=0):
_lock_unlock_module(name)
return module
def _recursive_import(import_, name):
"""Common exit point for recursive calls to the import machinery
This simplifies the process of stripping importlib from tracebacks
"""
return import_(name)
def _handle_fromlist(module, fromlist, import_):
"""Figure out what __import__ should return.
@ -1569,7 +1575,8 @@ def _handle_fromlist(module, fromlist, import_):
fromlist.extend(module.__all__)
for x in fromlist:
if not hasattr(module, x):
import_('{}.{}'.format(module.__name__, x))
_recursive_import(import_,
'{}.{}'.format(module.__name__, x))
return module