[Zope-Checkins] SVN: Zope/trunk/lib/python/Zope/__init__.py No that it works, make it pretty (#1233).

[Stefan H. Holek]

Log message for revision 25261:
No that it works, make it pretty (#1233).



-=-
Modified: Zope/trunk/lib/python/Zope/__init__.py
===================================================================
--- Zope/trunk/lib/python/Zope/__init__.py	2004-06-04 16:02:42 UTC (rev 25260)
+++ Zope/trunk/lib/python/Zope/__init__.py	2004-06-04 16:20:52 UTC (rev 25261)
@@ -33,8 +33,6 @@
 # old behavior is likely to cause problems as ZODB backends, like ZEO,
 # gain new features.
 
-from Zope.Startup.run import configure
-
 _began_startup = 0
 
 def startup():
@@ -44,12 +42,7 @@
         # Already began (and maybe finished) startup, so don't run again
         return
     _began_startup = 1
-    # Load configuration file from (optional) environment variable
-    # Also see http://zope.org/Collectors/Zope/1233
-    import os
-    configfile = os.environ.get('ZOPE_CONFIG')
-    if configfile is not None:
-        configure(configfile)
+    _configure()
     from Zope.App.startup import startup as _startup
     _startup()
 
@@ -64,6 +57,16 @@
     import ZPublisher
     return ZPublisher.test('Zope', *args, **kw)
 
+from Zope.Startup.run import configure
+
+def _configure():
+    # Load configuration file from (optional) environment variable
+    # Also see http://zope.org/Collectors/Zope/1233
+    import os
+    configfile = os.environ.get('ZOPE_CONFIG')
+    if configfile is not None:
+        configure(configfile)
+
 # Zope.App.startup.startup() sets the following variables in this module.
 DB = None
 bobo_application = None