Changeset 391 for python/trunk/Lib/getopt.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/getopt.py (modified) (4 diffs)

python/trunk/Lib/getopt.py

@@ -1 @@
-# -*- coding: iso-8859-1 -*-
 """Parser for command line options.
 
@@ -21 +20 @@
 # to class-based exceptions.
 #
-# Peter Åstrand <astrand@lysator.liu.se> added gnu_getopt().
+# Peter Astrand <astrand@lysator.liu.se> added gnu_getopt().
 #
 # TODO for gnu_getopt():
@@ -131 +130 @@
         if args[0][:2] == '--':
             opts, args = do_longs(opts, args[0][2:], longopts, args[1:])
-        elif args[0][:1] == '-':
+        elif args[0][:1] == '-' and args[0] != '-':
             opts, args = do_shorts(opts, args[0][1:], shortopts, args[1:])
         else:
@@ -157 +156 @@
                 raise GetoptError('option --%s requires argument' % opt, opt)
             optarg, args = args[0], args[1:]
-    elif optarg:
+    elif optarg is not None:
         raise GetoptError('option --%s must not have an argument' % opt, opt)
     opts.append(('--' + opt, optarg or ''))