changeset 3898:316cd5b0c940

Merge with main
author Brendan Cully <brendan@kublai.com>
date Fri, 15 Dec 2006 11:14:55 -0800
parents 7034020aeaf9 (diff) f47afa2401a2 (current diff)
children 0d27502a804c
files mercurial/demandimport.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/demandimport.py	Fri Dec 15 12:38:18 2006 -0600
+++ b/mercurial/demandimport.py	Fri Dec 15 11:14:55 2006 -0800
@@ -35,8 +35,8 @@
         else:
             head = name
             after = []
-        self.__dict__["_data"] = (head, globals, locals, after)
-        self.__dict__["_module"] = None
+        object.__setattr__(self, "_data", (head, globals, locals, after))
+        object.__setattr__(self, "_module", None)
     def _extend(self, name):
         """add to the list of submodules to load"""
         self._data[3].append(name)
@@ -54,7 +54,7 @@
             # are we in the locals dictionary still?
             if locals and locals.get(head) == self:
                 locals[head] = mod
-            self.__dict__["_module"] = mod
+            object.__setattr__(self, "_module", mod)
     def __repr__(self):
         return "<unloaded module '%s'>" % self._data[0]
     def __call__(self, *args, **kwargs):