Extract authentication options handling into a separate function.

my_reviews.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 rietveld stats about the review you done, or forgot to do.
 
 Example:
   - my_reviews.py -r me@chromium.org -Q  for stats for last quarter.
 """
 import datetime
 import math
 import optparse
 import os
 import sys
 
+import auth
 import rietveld
 
 
 def username(email):
   """Keeps the username of an email address."""
   return email.split('@', 1)[0]
 
 
 def to_datetime(string):
   """Load UTC time as a string into a datetime object."""
@@ skipping 180 matching lines @@
   # More information is available, print issue.keys() to see them.
   print '%7d %10s %3s %14s %-15s  %s' % (
       issue['issue'],
       issue['created'][:10],
       reviewed,
       latency,
       issue['owner_email'],
       ', '.join(sorted(issue['reviewers'])))
 
 
-def print_reviews(reviewer, created_after, created_before, instance_url):
+def print_reviews(
+    reviewer, created_after, created_before, instance_url, auth_config):
   """Prints issues |reviewer| received and potentially reviewed."""
-  remote = rietveld.Rietveld(instance_url, None, None)
+  remote = rietveld.Rietveld(instance_url, auth_config)
 
   # The stats we gather. Feel free to send me a CL to get more stats.
   stats = Stats()
 
   # Column sizes need to match print_issue() output.
   print >> sys.stderr, (
       'Issue   Creation   Did         Latency Owner           Reviewers')
 
   # See def search() in rietveld.py to see all the filters you can use.
   issues = []
@@ skipping 31 matching lines @@
        ' gave multiple LGTMs on %d issues.') % (
       stats.lgtms, stats.percent_lgtm, stats.multiple_lgtms))
   print >> sys.stderr, (
       'Average latency from request to first comment is %s.' %
       to_time(stats.average_latency))
   print >> sys.stderr, (
       'Median latency from request to first comment is %s.' %
       to_time(stats.median_latency))
 
 
-def print_count(reviewer, created_after, created_before, instance_url):
-  remote = rietveld.Rietveld(instance_url, None, None)
+def print_count(
+    reviewer, created_after, created_before, instance_url, auth_config):
+  remote = rietveld.Rietveld(instance_url, auth_config)
   print len(list(remote.search(
       reviewer=reviewer,
       created_after=created_after,
       created_before=created_before,
       keys_only=True)))
 
 
 def get_previous_quarter(today):
   """There are four quarters, 01-03, 04-06, 07-09, 10-12.
 
@@ skipping 42 matching lines @@
   parser.add_option(
       '-e', '--end', metavar='<date>',
       help='Filter issues created before the date')
   parser.add_option(
       '-Q', '--last_quarter', action='store_true',
       help='Use last quarter\'s dates, e.g. %s to %s' % (begin, end))
   parser.add_option(
       '-i', '--instance_url', metavar='<host>',
       default='http://codereview.chromium.org',
       help='Host to use, default is %default')
+  auth.add_auth_options(parser)
   # Remove description formatting
   parser.format_description = (
       lambda _: parser.description)  # pylint: disable=E1101
   options, args = parser.parse_args()
+  auth_config = auth.extract_auth_config_from_options(options)
   if args:
     parser.error('Args unsupported')
   if options.reviewer is None:
     parser.error('$EMAIL_ADDRESS and $USER are not set, please use -r')
 
   print >> sys.stderr, 'Searching for reviews by %s' % options.reviewer
   if options.last_quarter:
     options.begin = begin
     options.end = end
     print >> sys.stderr, 'Using range %s to %s' % (
         options.begin, options.end)
   else:
     if options.begin is None or options.end is None:
       parser.error('Please specify either --last_quarter or --begin and --end')
 
   # Validate dates.
   try:
     to_datetime(options.begin)
     to_datetime(options.end)
   except ValueError as e:
     parser.error('%s: %s - %s' % (e, options.begin, options.end))
 
   if options.count:
     print_count(
         options.reviewer,
         options.begin,
         options.end,
-        options.instance_url)
+        options.instance_url,
+        auth_config)
   else:
     print_reviews(
         options.reviewer,
         options.begin,
         options.end,
-        options.instance_url)
+        options.instance_url,
+        auth_config)
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)