Extract authentication options handling into a separate function.

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'
 
 import functools
 import logging
 import optparse
 import os
 import sys
 import urllib2
 
 import breakpad  # pylint: disable=W0611
 
+import auth
 import fix_encoding
 import rietveld
 
 
 def usage(more):
   def hook(fn):
     fn.func_usage_more = more
     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=None, values=None):
       options, args = old_parse_args(args, values)
+      auth_config = auth.extract_auth_config_from_options(options)
       if not options.issue:
         parser.error('Require --issue')
-      obj = rietveld.Rietveld(options.server, options.user, None)
+      obj = rietveld.Rietveld(options.server, auth_config, options.user)
       return options, args, obj
 
     parser.parse_args = new_parse_args
 
     parser.add_option(
         '-u', '--user',
         metavar='U',
         default=os.environ.get('EMAIL_ADDRESS', None),
         help='Email address, default: %default')
     parser.add_option(
         '-i', '--issue',
         metavar='I',
         type='int',
         help='Rietveld issue number')
     parser.add_option(
         '-s',
         '--server',
         metavar='S',
         default='http://codereview.chromium.org',
         help='Rietveld server, default: %default')
+    auth.add_auth_options(parser)
 
     # Call the original function with the modified parser.
     return fn(parser, args, *extra_args, **kwargs)
 
   hook.func_usage_more = '[options]'
   return hook
 
 
 def set_commit(obj, issue, flag):
   """Sets the commit bit flag on an issue."""
@@ skipping 107 matching lines @@
   return CMDhelp(parser, args)
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)