Commit 790480c9 authored by Christian Robottom's avatar Christian Robottom

Renaming options to opts to avoid bizarre conflict with function name.

parent b909df74
...@@ -46,9 +46,8 @@ def usage(msg): ...@@ -46,9 +46,8 @@ def usage(msg):
def options(args): def options(args):
"""Password-specific options loaded from regular ZEO config file.""" """Password-specific options loaded from regular ZEO config file."""
try: try:
options, args = getopt.getopt(args, "dr:p:f:C:", ["configure=", opts, args = getopt.getopt(args, "dr:p:f:C:", ["configure=",
"protocol=", "protocol=",
"filename=", "filename=",
"realm"]) "realm"])
...@@ -59,7 +58,7 @@ def options(args): ...@@ -59,7 +58,7 @@ def options(args):
auth_protocol = None auth_protocol = None
auth_db = "" auth_db = ""
auth_realm = None auth_realm = None
for k, v in options: for k, v in opts:
if k == '-C' or k == '--configure': if k == '-C' or k == '--configure':
schemafile = os.path.join(os.path.dirname(ZEO.__file__), schemafile = os.path.join(os.path.dirname(ZEO.__file__),
"schema.xml") "schema.xml")
......
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