[Zope3-checkins] CVS: Zope3 - z3.py:1.11.2.1

[Guido van Rossum]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv28105

Modified Files:
      Tag: NameGeddon-branch
	z3.py 
Log Message:
Fix sys.path and some imports.


=== Zope3/z3.py 1.11 => 1.11.2.1 ===
--- Zope3/z3.py:1.11	Thu Dec 19 16:06:42 2002
+++ Zope3/z3.py	Tue Dec 24 13:52:39 2002
@@ -36,8 +36,8 @@
     # setting python paths
     program = argv[0]
     here = os.path.join(os.getcwd(), os.path.split(program)[0])
-    libpython = os.path.join(here, 'lib', 'python') 
-    sys.path = [libpython, here] + basepath
+    srcdir = os.path.abspath('src')
+    sys.path = [srcdir, here] + basepath
 
     # Initialize the logging module.
     import logging.config
@@ -51,7 +51,7 @@
     dir = os.getcwd()
 
     # Do global software config
-    from Zope.App import config
+    from zope.app import config
     config('site.zcml')
     
     # Load server config
@@ -60,7 +60,7 @@
         ):
         open('zserver.zcml', 'w').write(open('zserver.zcml.in').read())
         
-    from Zope.Configuration.xmlconfig import XMLConfig
+    from zope.configuration.xmlconfig import XMLConfig
     XMLConfig(os.path.join(dir, 'zserver.zcml'))()
 
     import ThreadedAsync