[Zope-Checkins] CVS: Zope/lib/python - zope.py:1.1.2.7

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
Changes to support new ZConfig regime.


=== Zope/lib/python/zope.py 1.1.2.6 => 1.1.2.7 ===
--- Zope/lib/python/zope.py:1.1.2.6	Mon Nov 25 02:41:56 2002
+++ Zope/lib/python/zope.py	Thu Jan  2 11:53:33 2003
@@ -19,7 +19,7 @@
 """
 
 import os, sys, getopt, traceback
-from Controller import configure, getSchemaKeys, ConfigurationError
+from Startup import configure, getSchemaKeys, ConfigurationError
 
 def usage():
     print """
@@ -59,7 +59,6 @@
         sys.path.insert(0, SOFTWARE_HOME)
 
     config_location = 'zope.conf'
-    schema_location = os.path.join(SOFTWARE_HOME,'Controller','directives.xml')
     overrides = {}
     schema_keys = getSchemaKeys()
     longopts = [ "help", "config="]
@@ -83,19 +82,20 @@
                 k = k[2:]
                 overrides[k] = v
 
+    dn = os.path.dirname
     configure(config_location, overrides)
 
     # start Zope
-    try:
-        from Controller import Main
-        Main.start_zope()
-    except SystemExit:
-        raise
-    except ConfigurationError, err:
-        log_error(str(err))
-        # tell zdaemon not to restart us by setting zero exit code
-        sys.exit(0)
-    except:
-        log_error('Unknown error', sys.exc_info())
-        # tell zdaemon not to restart us by setting zero exit code
-        sys.exit(0)
+##     try:
+    from Startup import start_zope
+    start_zope()
+##     except SystemExit:
+##         raise
+##     except ConfigurationError, err:
+##         log_error(str(err))
+##         # tell zdaemon not to restart us by setting zero exit code
+##         sys.exit(0)
+##     except:
+##         log_error('Unknown error', sys.exc_info())
+##         # tell zdaemon not to restart us by setting zero exit code
+##         sys.exit(0)