From: Georg Brandl <georg@python.org>
Date: Thu, 23 Nov 2006 09:55:10 +0000 (+0000)
Subject: Bug #1601630: little improvement to getopt docs
X-Git-Tag: v2.5.1c1~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c55236d39c5c3066903ace1c28e6a88c4efa2d0;p=python

Bug #1601630: little improvement to getopt docs
 (backport from rev. 52833)
---

diff --git a/Doc/lib/libgetopt.tex b/Doc/lib/libgetopt.tex
index e8b16a31e2..b38fcd8dff 100644
--- a/Doc/lib/libgetopt.tex
+++ b/Doc/lib/libgetopt.tex
@@ -126,8 +126,9 @@ import getopt, sys
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "ho:v", ["help", "output="])
-    except getopt.GetoptError:
+    except getopt.GetoptError, err:
         # print help information and exit:
+        print str(err) # will print something like "option -a not recognized"
         usage()
         sys.exit(2)
     output = None
@@ -135,11 +136,13 @@ def main():
     for o, a in opts:
         if o == "-v":
             verbose = True
-        if o in ("-h", "--help"):
+        elif o in ("-h", "--help"):
             usage()
             sys.exit()
-        if o in ("-o", "--output"):
+        elif o in ("-o", "--output"):
             output = a
+        else:
+            assert False, "unhandled option"
     # ...
 
 if __name__ == "__main__":