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

Andreas Jung andreas at andreas-jung.com
Sat May 15 03:54:56 EDT 2004


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

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
temporarily bailing out the ZOPE_CONFIG patch because it breaks some unittests


=== Zope/lib/python/Zope/__init__.py 1.35.36.2 => 1.35.36.3 ===
--- Zope/lib/python/Zope/__init__.py:1.35.36.2	Fri May 14 08:00:37 2004
+++ Zope/lib/python/Zope/__init__.py	Sat May 15 03:54:25 2004
@@ -45,12 +45,8 @@
     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
-    will try to load zope.conf using ZOPE_CONFIG environment var"""
-    configure()
+    """Utility for scripts to open a connection to the database"""
     startup()
     return bobo_application(*args, **kw)
 
@@ -60,6 +56,7 @@
     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




More information about the Zope-Checkins mailing list