[Zope-Checkins] CVS: ZODB3/ZEO - runsvr.py:1.17

Barry Warsaw barry@wooz.org
Mon, 9 Dec 2002 13:39:59 -0500


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

Modified Files:
	runsvr.py 
Log Message:
ZConfig.Common is gone now says Fred.  Exceptions come out of ZConfig
instead now.


=== ZODB3/ZEO/runsvr.py 1.16 => 1.17 ===
--- ZODB3/ZEO/runsvr.py:1.16	Mon Nov 25 17:22:10 2002
+++ ZODB3/ZEO/runsvr.py	Mon Dec  9 13:39:58 2002
@@ -41,7 +41,6 @@
 import zLOG
 
 import ZConfig
-import ZConfig.Common
 
 
 class Options:
@@ -125,7 +124,7 @@
             return
         try:
             self.rootconf = ZConfig.load(self.configuration)
-        except ZConfig.Common.ConfigurationError, errobj:
+        except ZConfig.ConfigurationError, errobj:
             self.usage(str(errobj))
 
     def help(self):
@@ -208,7 +207,7 @@
             return
         try:
             self.hostconf = self.rootconf.getSection("Host")
-        except ZConfig.Common.ConfigurationConflictingSectionError:
+        except ZConfig.ConfigurationConflictingSectionError:
             if not self.hostname:
                 self.hostname = socket.getfqdn()
             self.hostconf = self.rootconf.getSection("Host", self.hostname)