mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Turn _return_module() into _handle_fromlist().

Browse source
This commit is contained in:
Brett Cannon 2012-02-23 20:47:57 -05:00
parent 6858cabb26
commit 4b03b68635
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Lib/importlib/_bootstrap.py
View file

@ -1001,7 +1001,7 @@ def _gcd_import(name, package=None, level=0):
return _find_and_load(name, _gcd_import) return _find_and_load(name, _gcd_import)
def _return_module(module, name, fromlist, level, import_): def _handle_fromlist(module, fromlist, import_):
"""Figure out what __import__ should return. """Figure out what __import__ should return.
The import_ parameter is a callable which takes the name of module to The import_ parameter is a callable which takes the name of module to
@ -1010,29 +1010,18 @@ def _return_module(module, name, fromlist, level, import_):
""" """
# The hell that is fromlist ... # The hell that is fromlist ...
if not fromlist: # If a package was imported, try to import stuff from fromlist.
# Return up to the first dot in 'name'. This is complicated by the fact if hasattr(module, '__path__'):
# that 'name' may be relative. if '*' in fromlist and hasattr(module, '__all__'):
if level == 0: fromlist = list(fromlist)
return sys.modules[name.partition('.')[0]] fromlist.remove('*')
elif not name: fromlist.extend(module.__all__)
return module for x in (y for y in fromlist if not hasattr(module,y)):
else: try:
cut_off = len(name) - len(name.partition('.')[0]) import_('{0}.{1}'.format(module.__name__, x))
return sys.modules[module.__name__[:-cut_off]] except ImportError:
else: pass
# If a package was imported, try to import stuff from fromlist. return module
if hasattr(module, '__path__'):
if '*' in fromlist and hasattr(module, '__all__'):
fromlist = list(fromlist)
fromlist.remove('*')
fromlist.extend(module.__all__)
for x in (y for y in fromlist if not hasattr(module,y)):
try:
import_('{0}.{1}'.format(module.__name__, x))
except ImportError:
pass
return module
def _calc___package__(globals): def _calc___package__(globals):
@ -1066,7 +1055,18 @@ def __import__(name, globals={}, locals={}, fromlist=[], level=0):
else: else:
package = _calc___package__(globals) package = _calc___package__(globals)
module = _gcd_import(name, package, level) module = _gcd_import(name, package, level)
return _return_module(module, name, fromlist, level, _gcd_import) if not fromlist:
# Return up to the first dot in 'name'. This is complicated by the fact
# that 'name' may be relative.
if level == 0:
return sys.modules[name.partition('.')[0]]
elif not name:
return module
else:
cut_off = len(name) - len(name.partition('.')[0])
return sys.modules[module.__name__[:-cut_off]]
else:
return _handle_fromlist(module, fromlist, _gcd_import)
def _setup(sys_module, imp_module): def _setup(sys_module, imp_module):