From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:44:37 +0000 (+0000)
Subject: Better detection of bad entries in option table.
X-Git-Tag: v1.6a1~1012
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0081cc529ccf205a3a8c40375848b51caae9537b;p=thirdparty%2FPython%2Fcpython.git

Better detection of bad entries in option table.
Better error messages for bad entries in option table.
---

diff --git a/Lib/distutils/fancy_getopt.py b/Lib/distutils/fancy_getopt.py
index c63ce61b8ed4..125dceb3e145 100644
--- a/Lib/distutils/fancy_getopt.py
+++ b/Lib/distutils/fancy_getopt.py
@@ -47,16 +47,24 @@ def fancy_getopt (options, object, args):
     attr_name = {}
     takes_arg = {}
 
-    for (long, short, help) in options:
+    for option in options:
+        try:
+            (long, short, help) = option
+        except ValueError:
+            raise DistutilsGetoptError, \
+                  "invalid option tuple " + str (option)
+
         # Type-check the option names
         if type (long) is not StringType or len (long) < 2:
             raise DistutilsGetoptError, \
-                  "long option must be a string of length >= 2"
+                  "long option '%s' must be a string of length >= 2" % \
+                  long
 
         if (not ((short is None) or
                  (type (short) is StringType and len (short) == 1))):
             raise DistutilsGetoptError, \
-                  "short option must be None or string of length 1"
+                  "short option '%s' must be None or string of length 1" % \
+                  short
 
         long_opts.append (long)