[Zope-Checkins] CVS: Zope - z2.py:1.70

[Shane Hathaway]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv31825

Modified Files:
	z2.py 
Log Message:
Made it so z2.py can run with "-Z ''" again; otherwise a NameError occurs.


=== Zope/z2.py 1.69 => 1.70 ===
 # official one. Also gets SOFTWARE_HOME, INSTANCE_HOME, and CLIENT_HOME
 import ZServer
+import zdaemon
 
 if Zpid and not READ_ONLY:
-    import zdaemon, App.FindHomes, posix
+    import App.FindHomes, posix
     sys.ZMANAGED=1
     
     zdaemon.run(sys.argv, os.path.join(CLIENT_HOME, Zpid),