Merge fix for #8887 from 3.2

This commit is contained in:
Éric Araujo 2011-07-29 17:38:23 +02:00
commit c473f8ceac
3 changed files with 28 additions and 6 deletions

View file

@ -1479,13 +1479,14 @@ def locate(path, forceload=0):
else: break
if module:
object = module
for part in parts[n:]:
try: object = getattr(object, part)
except AttributeError: return None
return object
else:
if hasattr(builtins, path):
return getattr(builtins, path)
object = builtins
for part in parts[n:]:
try:
object = getattr(object, part)
except AttributeError:
return None
return object
# --------------------------------------- interactive interpreter interface