Merged revisions 83117 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r83117 | victor.stinner | 2010-07-24 03:07:52 +0200 (sam., 24 juil. 2010) | 11 lines
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 04e881e..f76d3de 100644
--- a/Lib/getopt.py
+++ b/Lib/getopt.py
@@ -156,7 +156,7 @@
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