Avoid calling __getattr__ in get_object.

Trundle · Trundle · commit 72e42f163ad0 · 2009-12-18T12:19:24.000+01:00
Also fix AttrCleaner's temporary __getattr__.
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -64,7 +64,7 @@ def __enter__(self):
             __getattr__ = getattr(type_, '__getattr__', None)
             if __getattr__ is not None:
                 try:
-                    setattr(type_, '__getattr__', (lambda _: None))
+                    setattr(type_, '__getattr__', (lambda *_, **__: None))
                 except TypeError:
                     __getattr__ = None
             __getattribute__ = getattr(type_, '__getattribute__', None)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -376,10 +376,12 @@ def current_string(self, concatenate=False):
         return ''.join(string)
 
     def get_object(self, name):
-        if name in self.interp.locals:
-            return self.interp.locals[name]
-        else:
-            return eval(name, self.interp.locals)
+        attributes = name.split('.')
+        obj = eval(attributes.pop(0), self.interp.locals)
+        while attributes:
+            with inspection.AttrCleaner(obj):
+                obj = getattr(obj, attributes.pop(0))
+        return obj
 
     def get_args(self):
         """Check if an unclosed parenthesis exists, then attempt to get the
