1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge heads

Browse Source
This commit is contained in:
Benjamin Peterson 2012-02-24 11:49:07 -05:00
commit c6fbf47b28
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/importlib/_bootstrap.py
View File

@ -890,17 +890,11 @@ class _ImportLockContext:
def _resolve_name(name, package, level): def _resolve_name(name, package, level):
"""Resolve a relative module name to an absolute one.""" """Resolve a relative module name to an absolute one."""
dot = len(package) bits = package.rsplit('.', level-1)
for x in range(level, 1, -1): if len(bits) < level:
try: raise ValueError('attempted relative import beyond top-level package')
dot = package.rindex('.', 0, dot) base = bits[0]
except ValueError: return '{0}.{1}'.format(base, name) if name else base
raise ValueError("attempted relative import beyond "
"top-level package")
if name:
return "{0}.{1}".format(package[:dot], name)
else:
return package[:dot]
def _find_module(name, path): def _find_module(name, path):