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

Wrapped a long line. 

Converted to use "".startswith() to avoid slicing (& temp string creation).
This commit is contained in:
Fred Drake 2001-12-12 06:20:34 +00:00
parent 8d0645cb84
commit 1e7dfd3745
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/getopt.py
View File

@ -68,7 +68,7 @@ def getopt(args, shortopts, longopts = []):
if args[0] == '--': if args[0] == '--':
args = args[1:] args = args[1:]
break break
if args[0][:2] == '--': if args[0].startswith('--'):
opts, args = do_longs(opts, args[0][2:], longopts, args[1:]) opts, args = do_longs(opts, args[0][2:], longopts, args[1:])
else: else:
opts, args = do_shorts(opts, args[0][1:], shortopts, args[1:]) opts, args = do_shorts(opts, args[0][1:], shortopts, args[1:])
@ -124,7 +124,8 @@ def do_shorts(opts, optstring, shortopts, args):
if short_has_arg(opt, shortopts): if short_has_arg(opt, shortopts):
if optstring == '': if optstring == '':
if not args: if not args:
raise GetoptError('option -%s requires argument' % opt, opt) raise GetoptError('option -%s requires argument' % opt,
opt)
optstring, args = args[0], args[1:] optstring, args = args[0], args[1:]
optarg, optstring = optstring, '' optarg, optstring = optstring, ''
else: else:
@ -135,7 +136,7 @@ def do_shorts(opts, optstring, shortopts, args):
def short_has_arg(opt, shortopts): def short_has_arg(opt, shortopts):
for i in range(len(shortopts)): for i in range(len(shortopts)):
if opt == shortopts[i] != ':': if opt == shortopts[i] != ':':
return shortopts[i+1:i+2] == ':' return shortopts.startswith(':', i+1)
raise GetoptError('option -%s not recognized' % opt, opt) raise GetoptError('option -%s not recognized' % opt, opt)
if __name__ == '__main__': if __name__ == '__main__':