Revert "Revert "Improve description layout. Improve coloring and add legend in help.""

commit_queue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Access the commit queue from the command line.
 """
 
 __version__ = '0.1'
 
@@ skipping 16 matching lines @@
     return fn
   return hook
 
 
 def need_issue(fn):
   """Post-parse args to create a Rietveld object."""
   @functools.wraps(fn)
   def hook(parser, args, *extra_args, **kwargs):
     old_parse_args = parser.parse_args
 
-    def new_parse_args(args):
-      options, args = old_parse_args(args)
+    def new_parse_args(args=None, values=None):
+      options, args = old_parse_args(args, values)
       if not options.issue:
         parser.error('Require --issue')
       obj = rietveld.Rietveld(options.server, options.user, None)
       return options, args, obj
 
     parser.parse_args = new_parse_args
 
     parser.add_option(
         '-u', '--user',
         metavar='U',
@@ skipping 47 matching lines @@
   options, args, obj = parser.parse_args(args)
   if args:
     parser.error('Unrecognized args: %s' % ' '.join(args))
   return set_commit(obj, options.issue, '0')
 
 
 ###############################################################################
 ## Boilerplate code
 
 
-def gen_parser():
-  """Returns an OptionParser instance with default options.
+class OptionParser(optparse.OptionParser):
+  """An OptionParser instance with default options.
 
   It should be then processed with gen_usage() before being used.
   """
-  parser = optparse.OptionParser(version=__version__)
-  # Remove description formatting
-  parser.format_description = (
-      lambda _: parser.description)  # pylint: disable=E1101
-  # Add common parsing.
-  old_parser_args = parser.parse_args
+  def __init__(self, *args, **kwargs):
+    optparse.OptionParser.__init__(self, *args, **kwargs)
+    self.add_option(
+        '-v', '--verbose', action='count', default=0,
+        help='Use multiple times to increase logging level')
 
-  def Parse(*args, **kwargs):
-    options, args = old_parser_args(*args, **kwargs)
+  def parse_args(self, args=None, values=None):
+    options, args = optparse.OptionParser.parse_args(self, args, values)
+    levels = [logging.WARNING, logging.INFO, logging.DEBUG]
     logging.basicConfig(
-        level=[logging.WARNING, logging.INFO, logging.DEBUG][
-            min(2, options.verbose)],
+        level=levels[min(len(levels) - 1, options.verbose)],
         format='%(levelname)s %(filename)s(%(lineno)d): %(message)s')
     return options, args
 
-  parser.parse_args = Parse
-
-  parser.add_option(
-      '-v', '--verbose', action='count', default=0,
-      help='Use multiple times to increase logging level')
-  return parser
+  def format_description(self, _):
+    """Removes description formatting."""
+    return self.description.rstrip() + '\n'
 
 
 def Command(name):
   return getattr(sys.modules[__name__], 'CMD' + name, None)
 
 
 @usage('<command>')
 def CMDhelp(parser, args):
   """Print list of commands or use 'help <command>'."""
   # Strip out the help command description and replace it with the module
@@ skipping 19 matching lines @@
   obj = Command(command)
   more = getattr(obj, 'func_usage_more')
   # OptParser.description prefer nicely non-formatted strings.
   parser.description = obj.__doc__ + '\n'
   parser.set_usage('usage: %%prog %s %s' % (command, more))
 
 
 def main(args=None):
   # Do it late so all commands are listed.
   # pylint: disable=E1101
-  parser = gen_parser()
+  parser = OptionParser(version=__version__)
   if args is None:
     args = sys.argv[1:]
   if args:
     command = Command(args[0])
     if command:
       # "fix" the usage and the description now that we know the subcommand.
       gen_usage(parser, args[0])
       return command(parser, args[1:])
 
   # Not a known command. Default to help.
   gen_usage(parser, 'help')
   return CMDhelp(parser, args)
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())