1.1 --- a/importer.py Sat Nov 12 23:27:04 2016 +0100
1.2 +++ b/importer.py Sat Nov 12 23:29:32 2016 +0100
1.3 @@ -187,7 +187,10 @@
1.4
1.5 "Identify 'name' using stored object and external name records."
1.6
1.7 - return self.objects.get(name) or self.all_name_references.get(name)
1.8 + ref = self.objects.get(name)
1.9 + if not ref or ref.has_kind("<module>"):
1.10 + ref = self.all_name_references.get(name) or ref
1.11 + return ref
1.12
1.13 # Indirect object retrieval.
1.14
1.15 @@ -342,7 +345,7 @@
1.16
1.17 # Record the type of all classes.
1.18
1.19 - self.type_ref = self.get_object("__builtins__.type")
1.20 + self.type_ref = self.get_object("__builtins__.core.type")
1.21
1.22 # Resolve dependencies within the program.
1.23