goto shouldn't call names_to_types

2014-01-06 21:20:38 +01:00
parent 8e982bf25c
commit ce207e6dbb
2 changed files with 5 additions and 5 deletions
@@ -231,6 +231,10 @@ class NameFinder(object):
            if result:
                break

+        if not result and isinstance(self.scope, er.Instance):
+            # __getattr__ / __getattribute__
+            result += self._check_getattr(self.scope)
+
        debug.dbg('sfn filter "%s" in (%s-%s): %s@%s'
                  % (self.name_str, self.scope, nscope, u(result), self.position))
        return result
@@ -248,10 +252,6 @@ class NameFinder(object):
                break
            flow_scope = flow_scope.parent

-        if not result and isinstance(self.scope, er.Instance):
-            # __getattr__ / __getattribute__
-            result += self._check_getattr(self.scope)
-
        return result

    def _check_getattr(self, inst):