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

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
Collector #1233: applied new patch for ZOPE_CONFIG env. variable


=== Zope/lib/python/Zope/__init__.py 1.35.36.3 => 1.35.36.4 ===
--- Zope/lib/python/Zope/__init__.py:1.35.36.3	Sat May 15 03:54:25 2004
+++ Zope/lib/python/Zope/__init__.py	Tue May 18 11:34:26 2004
@@ -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():
@@ -47,6 +49,8 @@
 
 def app(*args, **kw):
     """Utility for scripts to open a connection to the database"""
+    if bobo_application == None:
+        configure()
     startup()
     return bobo_application(*args, **kw)
 
@@ -55,8 +59,6 @@
     startup()
     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