[Zodb-checkins] CVS: ZODB3/ZEO - runsvr.py:1.21

Guido van Rossum guido@python.org
Thu, 2 Jan 2003 13:24:48 -0500


Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv29210

Modified Files:
	runsvr.py 
Log Message:
Switch to hopefully forward-compaitible way of loading the
configuration file (or URL).


=== ZODB3/ZEO/runsvr.py 1.20 => 1.21 ===
--- ZODB3/ZEO/runsvr.py:1.20	Fri Dec 20 15:47:46 2002
+++ ZODB3/ZEO/runsvr.py	Thu Jan  2 13:24:44 2003
@@ -39,7 +39,7 @@
 import socket
 
 import zLOG
-import ZConfig
+import ZConfig.Context
 
 
 class Options:
@@ -121,8 +121,9 @@
     def load_configuration(self):
         if self.rootconf or not self.configuration:
             return
+        c = ZConfig.Context.Context()
         try:
-            self.rootconf = ZConfig.load(self.configuration)
+            self.rootconf = c.loadURL(self.configuration)
         except ZConfig.ConfigurationError, errobj:
             self.usage(str(errobj))