Extract authentication options handling into a separate function.

my_activity.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Get stats about your activity.
 
 Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
   - my_activity.py -Y  for stats for this year.
   - my_activity.py -b 4/5/12  for stats since 4/5/12.
   - my_activity.py -b 4/5/12 -e 6/7/12 for stats between 4/5/12 and 6/7/12.
 """
 
+# TODO(vadimsh): This script knows too much about ClientLogin and cookies. It
+# will stop to work on ~20 Apr 2015.
+
 # These services typically only provide a created time and a last modified time
 # for each item for general queries. This is not enough to determine if there
 # was activity in a given time period. So, we first query for all things created
 # before end and modified after begin. Then, we get the details of each item and
 # check those details to determine if there was activity in the given period.
 # This means that query time scales mostly with (today() - begin).
 
 import cookielib
 import datetime
 from datetime import datetime
 from datetime import timedelta
 from functools import partial
 import json
 import optparse
 import os
 import subprocess
 import sys
 import urllib
 import urllib2
 
+import auth
 import gerrit_util
 import rietveld
 from third_party import upload
 
 try:
   from dateutil.relativedelta import relativedelta # pylint: disable=F0401
 except ImportError:
   print 'python-dateutil package required'
   exit(1)
 
@@ skipping 214 matching lines @@
       for instance in filtered_instances:
         print '\t' + instance['url']
       print 'Use --auth if you would like to authenticate to them.\n'
 
   def rietveld_search(self, instance, owner=None, reviewer=None):
     if instance['requires_auth'] and not instance['auth']:
       return []
 
 
     email = None if instance['auth'] else ''
-    remote = rietveld.Rietveld('https://' + instance['url'], email, None)
+    auth_config = auth.extract_auth_config_from_options(self.options)
+    remote = rietveld.Rietveld('https://' + instance['url'], auth_config, email)
 
     # See def search() in rietveld.py to see all the filters you can use.
     query_modified_after = None
 
     if instance['supports_owner_modified_query']:
       query_modified_after = self.modified_after.strftime('%Y-%m-%d')
 
     # Rietveld does not allow search by both created_before and modified_after.
     # (And some instances don't allow search by both owner and modified_after)
     owner_email = None
@@ skipping 492 matching lines @@
       help='Specifies the format to use when printing reviews.')
   output_format_group.add_option(
       '--output-format-heading', metavar='<format>',
       default=u'{heading}:',
       help='Specifies the format to use when printing headings.')
   output_format_group.add_option(
       '-m', '--markdown', action='store_true',
       help='Use markdown-friendly output (overrides --output-format '
            'and --output-format-heading)')
   parser.add_option_group(output_format_group)
+  auth.add_auth_options(parser)
 
   # Remove description formatting
   parser.format_description = (
       lambda _: parser.description)  # pylint: disable=E1101
 
   options, args = parser.parse_args()
   options.local_user = os.environ.get('USER')
   if args:
     parser.error('Args unsupported')
   if not options.user:
@@ skipping 59 matching lines @@
   my_activity.print_issues()
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)