[Zope-Checkins] SVN: Zope/trunk/ removed ZOPE_CONFIG patch for collector #1233 since it broke ZopeTestCase

[Andreas Jung]

Log message for revision 30221:
  removed ZOPE_CONFIG patch for collector #1233 since it broke ZopeTestCase
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Zope2/Startup/options.py
  U   Zope/trunk/lib/python/Zope2/__init__.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-04-29 19:27:38 UTC (rev 30220)
+++ Zope/trunk/doc/CHANGES.txt	2005-05-01 08:23:12 UTC (rev 30221)
@@ -20,7 +20,9 @@
    - Change acquisition wrappers to implement the descr get slot
      directly, thus speeding the use of the slot.
 
+   - Collector #1233: port ZOPE_CONFIG patch from Zope 2.7 to Zope 2.8
 
+
   after Zope 2.8b1 
 
     Features added
@@ -29,8 +31,6 @@
 
     Bugs fixed
   
-      - Collector #1233: ported ZOPE_CONFIG patch from Zope 2.7 to Zope 2.8
-
       - Collector #1751: Improved error reporting reporting during the 
         startup phase
 

Modified: Zope/trunk/lib/python/Zope2/Startup/options.py
===================================================================
--- Zope/trunk/lib/python/Zope2/Startup/options.py	2005-04-29 19:27:38 UTC (rev 30220)
+++ Zope/trunk/lib/python/Zope2/Startup/options.py	2005-05-01 08:23:12 UTC (rev 30221)
@@ -24,7 +24,3 @@
     schemadir = os.path.dirname(os.path.abspath(__file__))
     schemafile = "zopeschema.xml"
 
-
-    def default_configfile(self):
-        """Use ZOPE_CONFIG if specified and -C not passed."""
-        return os.environ.get('ZOPE_CONFIG')

Modified: Zope/trunk/lib/python/Zope2/__init__.py
===================================================================
--- Zope/trunk/lib/python/Zope2/__init__.py	2005-04-29 19:27:38 UTC (rev 30220)
+++ Zope/trunk/lib/python/Zope2/__init__.py	2005-05-01 08:23:12 UTC (rev 30221)
@@ -42,9 +42,8 @@
         # Already began (and maybe finished) startup, so don't run again
         return
     _began_startup = 1
-    from Zope2.Startup.run import _setconfig
+    _configure()
     from Zope2.App.startup import startup as _startup
-    _setconfig()
     _startup()
 
 def app(*args, **kw):
@@ -59,8 +58,15 @@
     return ZPublisher.test('Zope', *args, **kw)
 
 
-from Zope2.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)
+
 # Zope2.App.startup.startup() sets the following variables in this module.
 DB = None
 bobo_application = None