Commit dc3b3551 authored by Barry Warsaw's avatar Barry Warsaw

ZConfig.Common is gone now says Fred. Exceptions come out of ZConfig

instead now.
parent 0ce17b49
...@@ -41,7 +41,6 @@ import socket ...@@ -41,7 +41,6 @@ import socket
import zLOG import zLOG
import ZConfig import ZConfig
import ZConfig.Common
class Options: class Options:
...@@ -125,7 +124,7 @@ class Options: ...@@ -125,7 +124,7 @@ class Options:
return return
try: try:
self.rootconf = ZConfig.load(self.configuration) self.rootconf = ZConfig.load(self.configuration)
except ZConfig.Common.ConfigurationError, errobj: except ZConfig.ConfigurationError, errobj:
self.usage(str(errobj)) self.usage(str(errobj))
def help(self): def help(self):
...@@ -208,7 +207,7 @@ class ZEOOptions(Options): ...@@ -208,7 +207,7 @@ class ZEOOptions(Options):
return return
try: try:
self.hostconf = self.rootconf.getSection("Host") self.hostconf = self.rootconf.getSection("Host")
except ZConfig.Common.ConfigurationConflictingSectionError: except ZConfig.ConfigurationConflictingSectionError:
if not self.hostname: if not self.hostname:
self.hostname = socket.getfqdn() self.hostname = socket.getfqdn()
self.hostconf = self.rootconf.getSection("Host", self.hostname) self.hostconf = self.rootconf.getSection("Host", self.hostname)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment