PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2024-11-25 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

setup.py: Removed command variants of --help and --version.

Browse source 
The code path to handle these was confusing, as was their usage as the usage referred only to the commands while some error messages only referred to the options.
This commit is contained in:
Michael Schwarz 2014-09-08 21:14:06 +02:00
parent 25682cdfe9
commit 4415291c0c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
setup.py
View file

@ -48,7 +48,7 @@ SYMBOLIC = 'symbolic'
class Setup(): class Setup():
def __init__(self): def __init__(self):
usage_script = '\033[34;1msetup.py\033[21;39m' usage_script = '\033[34;1msetup.py\033[21;39m'
usage_help = '(version | help)' usage_help = '(--version | --help)'
usage_proc = '[\033[4mconfigurations\033[24m] ([build] | prebuilt | install | (uninstall|clean)[-old] | view)' usage_proc = '[\033[4mconfigurations\033[24m] ([build] | prebuilt | install | (uninstall|clean)[-old] | view)'
usage = '%s %s\n%s %s' % (usage_script, usage_help, usage_script, usage_proc) usage = '%s %s\n%s %s' % (usage_script, usage_help, usage_script, usage_proc)
@ -260,9 +260,9 @@ class Setup():
if len(prefix) > 0: if len(prefix) > 0:
opts.opts['--prefix'] = [prefix] opts.opts['--prefix'] = [prefix]
if (opts.opts['--help'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'help')): if opts.opts['--help'] is not None:
opts.help() opts.help()
elif (opts.opts['--version'] is not None) or ((len(opts.files) == 1) and (opts.files[0] == 'version')): elif opts.opts['--version'] is not None:
print('Ponysay %s installer' % (PONYSAY_VERSION)) print('Ponysay %s installer' % (PONYSAY_VERSION))
elif len(opts.files) != 1: elif len(opts.files) != 1:
opts.print_fatal('A single command is expected on the command line.') opts.print_fatal('A single command is expected on the command line.')
@ -1148,13 +1148,13 @@ class ArgParser():
optqueue.append(arg_opt) optqueue.append(arg_opt)
argqueue.append(arg[arg.index('=') + 1:]) argqueue.append(arg[arg.index('=') + 1:])
else: else:
self.print_fatal('Unrecognized option {}. Use the help command or consult the manual.', arg) self.print_fatal('Unrecognized option {}. Use --help or consult the manual.', arg)
exit(-1) exit(-1)
elif (arg in self.optmap) and (self.optmap[arg][1] == ARGUMENTED): elif (arg in self.optmap) and (self.optmap[arg][1] == ARGUMENTED):
optqueue.append(arg) optqueue.append(arg)
get = True get = True
else: else:
self.print_fatal('Unrecognized option {}. Use the help command or consult the manual.', arg) self.print_fatal('Unrecognized option {}. Use --help or consult the manual.', arg)
exit(-1) exit(-1)
else: else:
self.files.append(arg) self.files.append(arg)