[Zope-Checkins] CVS: Zope/lib/python/Zope/App - startup.py:1.2.4.4

[Chris McDonough]

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

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


=== Zope/lib/python/Zope/App/startup.py 1.2.4.3 => 1.2.4.4 ===
--- Zope/lib/python/Zope/App/startup.py:1.2.4.3	Sun Nov 24 19:21:08 2002
+++ Zope/lib/python/Zope/App/startup.py	Thu Jan  2 11:53:55 2003
@@ -30,7 +30,7 @@
 import AccessControl.User
 import ZPublisher
 import ExtensionClass
-from Controller import configuration, ConfigurationError
+from Startup import getConfiguration, ConfigurationError
 from zLOG import LOG, WARNING, INFO, BLATHER, log_time
 
 
@@ -42,8 +42,9 @@
 
     # Import products
     OFS.Application.import_products()
+    configuration = getConfiguration()
 
-    databases = configuration['databases']
+    databases = configuration.databases
 
     DB = None