Merged revisions 83116 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83116 | victor.stinner | 2010-07-24 02:49:20 +0200 (sam., 24 juil. 2010) | 4 lines

  Issue #4629: getopt raises an error if an argument ends with = whereas getopt
  doesn't except a value (eg. --help= is rejected if getopt uses ['help='] long
  options).
........

diff --git a/Lib/getopt.py b/Lib/getopt.py
index 13ef4d623ec0a12930789b18689847470ec63a13..ac77126acf2fa09d965f57d8346b46991f0960a9 100644 (file)
--- a/Lib/getopt.py
+++ b/Lib/getopt.py
@@ -156,7 +156,7 @@ def do_longs(opts, opt, longopts, args):
             if not args:
                 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 ''))
     return opts, args

diff --git a/Lib/test/test_getopt.py b/Lib/test/test_getopt.py
index 20b569038b52ee88290d89d2bc95a31abdb460c4..f6f9d2efa81d470e9b8813a5a4ca17ea591cf665 100644 (file)
--- a/Lib/test/test_getopt.py
+++ b/Lib/test/test_getopt.py
@@ -174,6 +174,12 @@ class GetoptTests(unittest.TestCase):
         m = types.ModuleType("libreftest", s)
         run_doctest(m, verbose)
 
+    def test_issue4629(self):
+        longopts, shortopts = getopt.getopt(['--help='], '', ['help='])
+        self.assertEquals(longopts, [('--help', '')])
+        longopts, shortopts = getopt.getopt(['--help=x'], '', ['help='])
+        self.assertEquals(longopts, [('--help', 'x')])
+        self.assertRaises(getopt.GetoptError, getopt.getopt, ['--help='], '', ['help'])
 
 def test_main():
     run_unittest(GetoptTests)

diff --git a/Misc/NEWS b/Misc/NEWS
index 294ced7e7b2b9eda1c4a92df036a5e96fb0221b2..c6777cec5d47be07c03c4a2ce63a6be288300cb8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,10 @@ C-API
 Library
 -------
 
+- Issue #4629: getopt raises an error if an argument ends with = whereas getopt
+  doesn't except a value (eg. --help= is rejected if getopt uses ['help='] long
+  options).
+
 - Issue #7895: platform.mac_ver() no longer crashes after calling os.fork()
 
 - Issue #9323: Fixed a bug in trace.py that resulted in loosing the