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

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
Collector #1233: applied patch introducing $ZOPE_CONFIG to avoid the
necessisty to call Zope.configure() since Zope 2.7.0


=== Zope/lib/python/Zope/__init__.py 1.35.36.1 => 1.35.36.2 ===
--- Zope/lib/python/Zope/__init__.py:1.35.36.1	Sun Dec 21 19:24:25 2003
+++ Zope/lib/python/Zope/__init__.py	Fri May 14 08:00:37 2004
@@ -45,8 +45,12 @@
     from Zope.App.startup import startup as _startup
     _startup()
 
+from Zope.Startup.run import configure
+
 def app(*args, **kw):
-    """Utility for scripts to open a connection to the database"""
+    """Utility for scripts to open a connection to the database
+    will try to load zope.conf using ZOPE_CONFIG environment var"""
+    configure()
     startup()
     return bobo_application(*args, **kw)
 
@@ -56,7 +60,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