Commit 81a82e3b authored by Guido van Rossum's avatar Guido van Rossum

Switch to hopefully forward-compaitible way of loading the

configuration file (or URL).
parent b1dd4d80
...@@ -39,7 +39,7 @@ import signal ...@@ -39,7 +39,7 @@ import signal
import socket import socket
import zLOG import zLOG
import ZConfig import ZConfig.Context
class Options: class Options:
...@@ -121,8 +121,9 @@ class Options: ...@@ -121,8 +121,9 @@ class Options:
def load_configuration(self): def load_configuration(self):
if self.rootconf or not self.configuration: if self.rootconf or not self.configuration:
return return
c = ZConfig.Context.Context()
try: try:
self.rootconf = ZConfig.load(self.configuration) self.rootconf = c.loadURL(self.configuration)
except ZConfig.ConfigurationError, errobj: except ZConfig.ConfigurationError, errobj:
self.usage(str(errobj)) self.usage(str(errobj))
......
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