mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #15111: When a module was imported using a 'from import'

Browse source 
statement (e.g. ``from distutils import msvc9compiler``) that triggers
an ImportError of its own (e.g. the non-existence of winreg), let that
exception propagate instead of raising a generic ImportError for the
module being requested (e.g. msvc9compiler).
This commit is contained in:
Brett Cannon 2012-07-10 10:05:00 -04:00
parent c4618e33b2
commit 461c813164
4 changed files with 410 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/importlib/_bootstrap.py
View file

@ -1459,16 +1459,14 @@ 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 and hasattr(module, '__all__'):
if '*' in fromlist:
fromlist = list(fromlist)
fromlist.remove('*')
fromlist.extend(module.__all__)
if hasattr(module, '__all__'):
fromlist.extend(module.__all__)
for x in fromlist:
if not hasattr(module, x):
try:
import_('{}.{}'.format(module.__name__, x))
except ImportError:
pass
import_('{}.{}'.format(module.__name__, x))
return module