getattr on more complex objects - fixes #23

davidhalter · Oct 2, 2012 · 8d842dd · 8d842dd
1 parent 4d80297
commit 8d842dd
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/jedi/evaluate.py b/jedi/evaluate.py
@@ -494,18 +494,11 @@ def get_return_types(self, evaluate_generator=False):
                 for obj in objects:
                     if not isinstance(obj, (Instance, Class)):
                         debug.warning('getattr called without instance')
-                        return []
+                        continue
 
                     for name in names:
                         key = name.var_args.get_only_subelement()
-                        try:
-                            stmts.append(obj.get_subscope_by_name(key))
-                        except KeyError:
-                            debug.warning('called getattr() without string')
-                #if not (isinstance(name, Instance) \
-                        #and name.var_args:
-                    #debug.warning('getattr called without instance')
-                    #return []
+                        stmts += follow_path(iter([key]), obj)
                 return stmts
 
         if self.base.isinstance(Class):