Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify importib._resolve_name().

Browse source
This commit is contained in:
Brett Cannon 2012-02-24 11:20:54 -05:00
parent 842c0f17eb
commit 625cd23da4
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/importlib/_bootstrap.py
View file

@ -890,17 +890,11 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
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):