1.1 --- a/micropython/data.py Sat Jan 24 02:41:59 2009 +0100
1.2 +++ b/micropython/data.py Sun Jan 25 02:56:16 2009 +0100
1.3 @@ -58,10 +58,10 @@
1.4
1.5 "A mix-in providing dictionary methods."
1.6
1.7 - def __init__(self, global_namespace=None):
1.8 + def __init__(self, module=None):
1.9 self.namespace = {}
1.10 self.globals = set()
1.11 - self.global_namespace = global_namespace
1.12 + self.module = module
1.13 self.finalised = 0
1.14
1.15 def __delitem__(self, name):
1.16 @@ -98,7 +98,7 @@
1.17 """
1.18
1.19 if name in self.globals:
1.20 - self.global_namespace.set(name, value, 0)
1.21 + self.module.set(name, value, 0)
1.22 else:
1.23 attr = self._set(name, value)
1.24 attr.update(attr.value, single_assignment)
1.25 @@ -362,14 +362,14 @@
1.26
1.27 "An inspected class."
1.28
1.29 - def __init__(self, name, parent, global_namespace=None, node=None):
1.30 + def __init__(self, name, parent, module=None, node=None):
1.31
1.32 """
1.33 Initialise the class with the given 'name', 'parent' object, optional
1.34 - 'global_namespace' and optional AST 'node'.
1.35 + 'module' and optional AST 'node'.
1.36 """
1.37
1.38 - NamespaceDict.__init__(self, global_namespace)
1.39 + NamespaceDict.__init__(self, module)
1.40 self.name = name
1.41 self.parent = parent
1.42 self.astnode = node
1.43 @@ -700,17 +700,16 @@
1.44
1.45 "An inspected function."
1.46
1.47 - def __init__(self, name, parent, argnames, defaults, has_star, has_dstar, global_namespace=None, node=None):
1.48 + def __init__(self, name, parent, argnames, defaults, has_star, has_dstar, module=None, node=None):
1.49
1.50 """
1.51 Initialise the function with the given 'name', 'parent', list of
1.52 'argnames', list of 'defaults', the 'has_star' flag (indicating the
1.53 presence of a * parameter), the 'has_dstar' flag (indicating the
1.54 - presence of a ** parameter), optional 'global_namespace', and optional
1.55 - AST 'node'.
1.56 + presence of a ** parameter), optional 'module', and optional AST 'node'.
1.57 """
1.58
1.59 - NamespaceDict.__init__(self, global_namespace)
1.60 + NamespaceDict.__init__(self, module)
1.61 self.name = name
1.62 self.parent = parent
1.63 self.argnames = argnames
1.64 @@ -878,7 +877,7 @@
1.65 "Make a function from a method."
1.66
1.67 function = Function(self.name, self.parent, self.argnames[1:], self.defaults,
1.68 - self.has_star, self.has_dstar, self.global_namespace, self.astnode)
1.69 + self.has_star, self.has_dstar, self.module, self.astnode)
1.70 function.default_attrs = self.default_attrs
1.71 return function
1.72
1.73 @@ -886,8 +885,8 @@
1.74
1.75 "A module, class or function which was mentioned but could not be imported."
1.76
1.77 - def __init__(self, name, parent_name, global_namespace=None):
1.78 - NamespaceDict.__init__(self, global_namespace)
1.79 + def __init__(self, name, parent_name, module=None):
1.80 + NamespaceDict.__init__(self, module)
1.81 self.name = name
1.82 self.parent_name = parent_name
1.83 self.parent = None