traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getopt used to sort the long option names, in an attempt to simplify 

the logic.  That resulted in a bug.  My previous getopt checkin repaired
the bug but left the sorting.  The solution is significantly simpler if
we don't bother sorting at all, so this checkin gets rid of the sort and
the code that relied on it.
This commit is contained in:
Tim Peters 2000-12-29 02:17:56 +00:00
parent 36cdad12dd
commit d31b6328e1
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/getopt.py
View File

@ -65,7 +65,6 @@ def getopt(args, shortopts, longopts = []):
longopts = [longopts] longopts = [longopts]
else: else:
longopts = list(longopts) longopts = list(longopts)
longopts.sort()
while args and args[0].startswith('-') and args[0] != '-': while args and args[0].startswith('-') and args[0] != '-':
if args[0] == '--': if args[0] == '--':
args = args[1:] args = args[1:]
@ -99,19 +98,10 @@ def do_longs(opts, opt, longopts, args):
# Return: # Return:
# has_arg? # has_arg?
# full option name # full option name
# Assumes longopts has been sorted (ASCII order).
def long_has_args(opt, longopts): def long_has_args(opt, longopts):
for i in range(len(longopts)): possibilities = [o for o in longopts if o.startswith(opt)]
if longopts[i].startswith(opt): if not possibilities:
break
else:
raise GetoptError('option --%s not recognized' % opt, opt) raise GetoptError('option --%s not recognized' % opt, opt)
# opt is a prefix of longopts[i]; find j s.t. opt is a prefix of
# each possibility in longopts[i:j]
j = i+1
while j < len(longopts) and longopts[j].startswith(opt):
j += 1
possibilities = longopts[i:j]
# Is there an exact match? # Is there an exact match?
if opt in possibilities: if opt in possibilities:
return 0, opt return 0, opt