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

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
Honor Startup package move and reorganization of methods in Startup package.


=== Zope/lib/python/zope.py 1.1.2.8 => 1.1.2.9 ===
--- Zope/lib/python/zope.py:1.1.2.8	Fri Jan  3 01:28:57 2003
+++ Zope/lib/python/zope.py	Sat Jan  4 23:06:05 2003
@@ -19,7 +19,6 @@
 """
 
 import os, sys, getopt, traceback
-from Startup import configure, getSchemaKeys, ConfigurationError
 
 def usage():
     print """
@@ -46,8 +45,9 @@
         import zLOG
         zLOG.LOG('Zope', zLOG.PANIC, msg, error=exc_info)
     except:
-        print msg
-        import traceback; traceback.print_exc()
+        pass
+    print msg
+    import traceback; traceback.print_exc()
 
 if __name__ == '__main__':
     # assume that this file is sys.argv[0], and that it lives in
@@ -58,6 +58,8 @@
     if SOFTWARE_HOME not in sys.path:
         sys.path.insert(0, SOFTWARE_HOME)
 
+    from Zope.Startup import getSchemaKeys, ConfigurationError, start_zope
+
     config_location = 'zope.conf'
     overrides = {}
     schema_keys = getSchemaKeys()
@@ -82,18 +84,10 @@
                 k = k[2:]
                 overrides[k] = v
 
-    dn = os.path.dirname
-    configure(config_location, overrides)
-
     try:
-        from Startup import start_zope
-        start_zope()
+        start_zope(config_location, overrides)
     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