1.1 --- a/inspector.py Fri Nov 18 16:47:07 2016 +0100
1.2 +++ b/inspector.py Fri Nov 18 17:25:24 2016 +0100
1.3 @@ -70,8 +70,8 @@
1.4
1.5 # Detect and record imports and globals declared in the module.
1.6
1.7 - self.assign_general_local("__name__", self.get_constant("str", self.name))
1.8 - self.assign_general_local("__file__", self.get_constant("str", filename))
1.9 + self.assign_general_local("__name__", self.get_constant("string", self.name))
1.10 + self.assign_general_local("__file__", self.get_constant("string", filename))
1.11 self.process_structure(self.astnode)
1.12
1.13 # Set the class of the module after the definition has occurred.
1.14 @@ -291,7 +291,8 @@
1.15 # Constant usage.
1.16
1.17 elif isinstance(n, compiler.ast.Const):
1.18 - return self.get_literal_instance(n, n.value.__class__.__name__)
1.19 + typename = n.value.__class__.__name__
1.20 + return self.get_literal_instance(n, typename == "str" and "string" or typename)
1.21
1.22 elif isinstance(n, compiler.ast.Dict):
1.23 return self.get_literal_instance(n, "dict")
1.24 @@ -527,7 +528,7 @@
1.25 self.set_name("__fn__") # special instantiator attribute
1.26 self.set_name("__args__") # special instantiator attribute
1.27
1.28 - self.assign_general_local("__name__", self.get_constant("str", class_name))
1.29 + self.assign_general_local("__name__", self.get_constant("string", class_name))
1.30 self.process_structure_node(n.code)
1.31 self.exit_namespace()
1.32 self.in_class = in_class