Extract authentication options handling into a separate function.
It is done in preparation for switching to OAuth2 as default (and only)
authentication method. Having all auth options handled by the same code makes it
easier to gradually add OAuth2 support.
As part of this, some options that would no longer work with OAuth2 (and that
are not being used from anywhere now, as far as I can tell) are removed:
* Passing account password for authentication via command line.
* Overriding 'Host' header when making requests to Rietveld (won't work with
SSL anyway).
* --account_type option (seems to be ClientLogin specific).
[email protected]
BUG=356813
Review URL: https://codereview.chromium.org/1075723002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294746 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/my_reviews.py b/my_reviews.py
index 6b36c56..a26aa02 100755
--- a/my_reviews.py
+++ b/my_reviews.py
@@ -14,6 +14,7 @@
import os
import sys
+import auth
import rietveld
@@ -214,9 +215,10 @@
', '.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()
@@ -268,8 +270,9 @@
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,
@@ -332,10 +335,12 @@
'-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:
@@ -363,13 +368,15 @@
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
