[Zodb-checkins] CVS: ZODB3/ZEO - zeopasswd.py:1.2.6.3

[Christian Reis]

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

Modified Files:
      Tag: Zope-2_7-branch
	zeopasswd.py 
Log Message:
Renaming options to opts to avoid bizarre conflict with function name.


=== ZODB3/ZEO/zeopasswd.py 1.2.6.2 => 1.2.6.3 ===
--- ZODB3/ZEO/zeopasswd.py:1.2.6.2	Thu Dec 18 21:08:42 2003
+++ ZODB3/ZEO/zeopasswd.py	Thu Dec 18 21:59:54 2003
@@ -46,9 +46,8 @@
 
 def options(args):
     """Password-specific options loaded from regular ZEO config file."""
-
     try:
-        options, args = getopt.getopt(args, "dr:p:f:C:", ["configure=", 
+        opts, args = getopt.getopt(args, "dr:p:f:C:", ["configure=", 
                                                           "protocol=", 
                                                           "filename=",
                                                           "realm"])
@@ -59,7 +58,7 @@
     auth_protocol = None
     auth_db = "" 
     auth_realm = None
-    for k, v in options:
+    for k, v in opts:
         if k == '-C' or k == '--configure':
             schemafile = os.path.join(os.path.dirname(ZEO.__file__),
                                                      "schema.xml")