[Zope-Checkins] SVN: Zope/trunk/lib/python/Zope/ mcdonc got a few lines wrong while merging.

[Stefan H. Holek]

Log message for revision 25109:
mcdonc got a few lines wrong while merging.



-=-
Modified: Zope/trunk/lib/python/Zope/Startup/run.py
===================================================================
--- Zope/trunk/lib/python/Zope/Startup/run.py	2004-05-28 21:58:44 UTC (rev 25108)
+++ Zope/trunk/lib/python/Zope/Startup/run.py	2004-05-28 22:18:48 UTC (rev 25109)
@@ -28,9 +28,6 @@
     configure('/path/to/configfile'); import Zope; app = Zope.app() """
     import Zope.Startup
     starter = Zope.Startup.get_starter()
-    if not configfile:
-        import os
-        configfile = os.getenv("ZOPE_CONFIG")
     opts = _setconfig(configfile)
     starter.setConfiguration(opts.configroot)
     starter.setupSecurityOptions()

Modified: Zope/trunk/lib/python/Zope/__init__.py
===================================================================
--- Zope/trunk/lib/python/Zope/__init__.py	2004-05-28 21:58:44 UTC (rev 25108)
+++ Zope/trunk/lib/python/Zope/__init__.py	2004-05-28 22:18:48 UTC (rev 25109)
@@ -33,6 +33,8 @@
 # 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():
@@ -62,8 +64,6 @@
     import ZPublisher
     return ZPublisher.test('Zope', *args, **kw)
 
-from Zope.Startup.run import configure
-
 # Zope.App.startup.startup() sets the following variables in this module.
 DB = None
 bobo_application = None