[Zope-Checkins] CVS: Zope/lib/python/Zope - __init__.py:1.35.36.6

[Stefan H. Holek]

Update of /cvs-repository/Zope/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv19443/lib/python/Zope

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
No that it works, make it pretty (#1233).


=== Zope/lib/python/Zope/__init__.py 1.35.36.5 => 1.35.36.6 ===
--- Zope/lib/python/Zope/__init__.py:1.35.36.5	Fri May 28 11:25:44 2004
+++ Zope/lib/python/Zope/__init__.py	Fri Jun  4 12:20:40 2004
@@ -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()
 
@@ -63,6 +56,16 @@
     startup()
     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