# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1166157534 -3600
# Node ID 7034020aeaf9ffc80f2d2fb651271011d8ce9544
# Parent  3b628b5da9e95973a79ad2ab1738965d529de66a# Parent  d6cc510dfe5e191b7b19422cbd3b3aaa04e46fc2
merge with main

diff -r d6cc510dfe5e -r 7034020aeaf9 mercurial/demandimport.py
--- a/mercurial/demandimport.py	Thu Dec 14 20:31:33 2006 -0600
+++ b/mercurial/demandimport.py	Fri Dec 15 05:38:54 2006 +0100
@@ -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):