[Checkins] SVN: zodbcode/trunk/src/zodbcode/module.py Stop to use "__persistent_module_registry__" as global variable name

Yusei Tahara yusei at domen.cx
Tue Feb 5 20:00:35 EST 2008


Log message for revision 83568:
  Stop to use "__persistent_module_registry__" as global variable name
  in zodbcode.module, because C extension module which imports another
  module(zope.security._proxy for example) will be failed to import.
  

Changed:
  U   zodbcode/trunk/src/zodbcode/module.py

-=-
Modified: zodbcode/trunk/src/zodbcode/module.py
===================================================================
--- zodbcode/trunk/src/zodbcode/module.py	2008-02-06 00:58:59 UTC (rev 83567)
+++ zodbcode/trunk/src/zodbcode/module.py	2008-02-06 01:00:35 UTC (rev 83568)
@@ -93,7 +93,7 @@
     def __init__(self, name):
         self.__name__ = name
 
-__persistent_module_registry__ = "__persistent_module_registry__"
+persistent_module_registry_global_name = "__persistent_module_registry__"
 
 def newModule(registry, name, source):
     """Return a manager object for a newly created module."""
@@ -109,11 +109,11 @@
     module._p_changed = True
     moddict = module.__dict__
     old_names = NameFinder(module)
-    moddict[__persistent_module_registry__] = registry
+    moddict[persistent_module_registry_global_name] = registry
     # XXX need to be able to replace sys.std{in,out,err} at this point
     exec source in moddict
     # XXX and restore them here.
-    del moddict[__persistent_module_registry__]
+    del moddict[persistent_module_registry_global_name]
     new_names = NameFinder(module)
     replacements = new_names.replacements(old_names)
     convert(module, replacements)
@@ -265,7 +265,7 @@
                 self._import(registry, fullname, None, [])
 
     def __import__(self, name, globals={}, locals={}, fromlist=[]):
-        registry = globals.get(__persistent_module_registry__)
+        registry = globals.get(persistent_module_registry_global_name)
         if registry is not None:
             mod = self._import(registry, name, self._get_parent(globals),
                                fromlist)



More information about the Checkins mailing list