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

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	__init__.py 
Log Message:
Replace removed import which is exported.

Fix a startup-preventing bug.


=== Zope/lib/python/Zope/Startup/__init__.py 1.1.2.3 => 1.1.2.4 ===
--- Zope/lib/python/Zope/Startup/__init__.py:1.1.2.3	Fri Jan 24 18:28:49 2003
+++ Zope/lib/python/Zope/Startup/__init__.py	Sat Jan 25 18:05:13 2003
@@ -8,7 +8,7 @@
 import ZConfig
 
 from misc.lock_file import lock_file
-from cmdline import getOptions # exported
+from cmdline import getOptions, getOptionDescriptions # exported
 
 # global to hold config structures
 _schema = None
@@ -34,11 +34,10 @@
     import handlers
     schema = getSchema()
     _configuration, handler = ZConfig.loadConfig(schema, config_location)
-    handlers.handleConfig(config, handler, options)
+    handlers.handleConfig(_configuration, handler, options)
     return _configuration
 
 def start_zope(config_location, options):
-    # caller must set configuration
     check_python_version()
     cfg = configure(config_location, options)