Merge fix for #8887 from 3.2

1 files changed, 7 insertions, 6 deletions

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index ebd8a61..f0b0200 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -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