1.1 --- a/resolving.py Sat Mar 11 01:04:19 2017 +0100
1.2 +++ b/resolving.py Sat Mar 11 16:43:23 2017 +0100
1.3 @@ -297,12 +297,12 @@
1.4
1.5 elif isinstance(name_ref, LocalNameRef):
1.6 key = "%s.%s" % (path, name_ref.name)
1.7 - origin = self.name_references.get(key)
1.8 + ref = self.name_references.get(key)
1.9
1.10 # Accesses that do not refer to known static objects
1.11 # cannot be resolved, but they may be resolvable later.
1.12
1.13 - if not origin:
1.14 + if not ref:
1.15 if not invocation:
1.16
1.17 # Record the path used for tracking purposes
1.18 @@ -313,17 +313,15 @@
1.19
1.20 continue
1.21
1.22 - ref = self.get_resolved_object(origin)
1.23 + ref = self.get_resolved_object(ref.get_origin())
1.24 if not ref:
1.25 continue
1.26
1.27 elif isinstance(name_ref, NameRef):
1.28 key = "%s.%s" % (path, name_ref.name)
1.29 - origin = self.name_references.get(key)
1.30 - if not origin:
1.31 - continue
1.32 + ref = self.name_references.get(key)
1.33
1.34 - ref = self.get_resolved_object(origin)
1.35 + ref = ref and self.get_resolved_object(ref.get_origin())
1.36 if not ref:
1.37 continue
1.38