diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-09-29 22:21:14 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-09-29 22:21:14 +0200 |
| commit | 3447dcdab7946619f42568881bf8368490329b06 (patch) | |
| tree | bbc8421bdefffe18a5edceea5fe5b9a6da88d0a5 /ponysay | |
| parent | 0e5ce47b7b15b08bcb4633c766ee49a6b05cf15b (diff) | |
| parent | cc6df2706f0ee88a32ced8f14bbe6c40d9bc121a (diff) | |
| download | ponysay-3447dcdab7946619f42568881bf8368490329b06.tar.gz ponysay-3447dcdab7946619f42568881bf8368490329b06.tar.bz2 ponysay-3447dcdab7946619f42568881bf8368490329b06.zip | |
Merge branch 'develop'
Diffstat (limited to 'ponysay')
| -rwxr-xr-x | ponysay | 32 |
1 files changed, 18 insertions, 14 deletions
@@ -67,6 +67,8 @@ class Ponysay(): elif args.opts['++onelist'] is not None: self.__extraponies(); self.onelist() elif args.opts['+l'] is not None: self.__extraponies(); self.list() elif args.opts['+L'] is not None: self.__extraponies(); self.linklist() + elif args.opts['-A'] is not None: self.list(); self.__extraponies(); self.list() + elif args.opts['+A'] is not None: self.linklist(); self.__extraponies(); self.linklist() else: self.__extraponies(args) self.__bestpony(args) @@ -1750,20 +1752,22 @@ opts.add_argumentless(['--quoters']) opts.add_argumentless(['--onelist']) opts.add_argumentless(['++onelist']) -opts.add_argumentless(['-h', '--help'], help = 'Print this help message.') -opts.add_argumentless(['-v', '--version'], help = 'Print the version of the program.') -opts.add_argumentless(['-l', '--list'], help = 'List pony names.') -opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.') -opts.add_argumentless(['+l', '++list'], help = 'List non-MLP:FiM pony names.') -opts.add_argumentless(['+L', '++symlist', '++altlist'], help = 'List non-MLP:FiM pony names with alternatives.') -opts.add_argumentless(['-B', '--bubblelist', '--balloonlist'], help = 'List balloon styles.') -opts.add_argumentless(['-c', '--compact'], help = 'Compress messages.') -opts.add_argumented( ['-W', '--wrap'], arg = 'COLUMN', help = 'Specify column where the message should be wrapped.') -opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.') -opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.') -opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.') -opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.') - +opts.add_argumentless(['-h', '--help'], help = 'Print this help message.') +opts.add_argumentless(['-v', '--version'], help = 'Print the version of the program.') +opts.add_argumentless(['-l', '--list'], help = 'List pony names.') +opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.') +opts.add_argumentless(['+l', '++list'], help = 'List non-MLP:FiM pony names.') +opts.add_argumentless(['+L', '++symlist', '++altlist'], help = 'List non-MLP:FiM pony names with alternatives.') +opts.add_argumentless(['-A', '--all'], help = 'List MLP:FIM and non-MLP:FiM pony names.') +opts.add_argumentless(['+A', '++all'], help = 'List MLP:FIM and non-MLP:FiM pony names with alternatives.') +opts.add_argumentless(['-B', '--bubblelist', '--balloonlist'], help = 'List balloon styles.') +opts.add_argumentless(['-c', '--compact'], help = 'Compress messages.') +opts.add_argumented( ['-W', '--wrap'], arg = 'COLUMN', help = 'Specify column where the message should be wrapped.') +opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.') +opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.') +opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.') +opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.') + opts.parse() |