[Checkins] SVN: Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/Startup/datatypes.py Defer problematic early import of OFS.Uninstalled.

Tres Seaver tseaver at palladion.com
Sat Dec 27 00:02:50 EST 2008


Log message for revision 94371:
  Defer problematic early import of OFS.Uninstalled.

Changed:
  U   Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/Startup/datatypes.py

-=-
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/Startup/datatypes.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/Startup/datatypes.py	2008-12-27 04:39:31 UTC (rev 94370)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/Startup/datatypes.py	2008-12-27 05:02:50 UTC (rev 94371)
@@ -19,7 +19,6 @@
 
 from ZConfig.components.logger import logger
 from ZODB.config import ZODBDatabase
-import OFS.Uninstalled
 
 # generic datatypes
 
@@ -320,6 +319,7 @@
                        ):
     """Class factory without ZClass support.
     """
+    import OFS.Uninstalled
     try:
         m = __import__(module, _globals, _globals, _silly)
         return getattr(m, name)
@@ -331,6 +331,7 @@
                      ):
     """Class factory with ZClass support.
     """
+    import OFS.Uninstalled
     try:
         if module[:1]=='*':
             # ZCLass! Yee ha!



More information about the Checkins mailing list