mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 83117 via svnmerge from

Browse source 
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).
  ........
................
This commit is contained in:
Victor Stinner 2010-07-24 01:12:54 +00:00
parent 1270bb9d14
commit a417db544e
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/getopt.py
View file

@ -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