appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py - Issue 1260293009: make version of ts_mon compatible with appengine

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py

Issue 1260293009: make version of ts_mon compatible with appengine (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: clean up code Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« appengine/chromium_build_logs/third_party/apiclient/__init__.py ('K') | « appengine/chromium_build_logs/third_party/oauth2client/gce.py ('k') | appengine/chromium_build_logs/third_party/oauth2client/locked_file.py » ('j') | appengine/chromium_build_logs/third_party/six.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py

diff --git a/appengine/chromium_rietveld/third_party/oauth2client/keyring_storage.py b/appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py

similarity index 95%

copy from appengine/chromium_rietveld/third_party/oauth2client/keyring_storage.py

copy to appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py

index efe2949cd55d4012bcd9b68f973909c690f7d136..cda1d9a3abde7b4e6fedcbb9090366e0cfda1242 100644

--- a/appengine/chromium_rietveld/third_party/oauth2client/keyring_storage.py

+++ b/appengine/chromium_build_logs/third_party/oauth2client/keyring_storage.py

@@ -1,4 +1,4 @@

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

@@ -19,11 +19,12 @@ A Storage for Credentials that uses the keyring module.

__author__ = 'jcgregorio@google.com (Joe Gregorio)'

-import keyring

import threading

-from client import Storage as BaseStorage

-from client import Credentials

+import keyring

+from oauth2client.client import Credentials

+from oauth2client.client import Storage as BaseStorage

class Storage(BaseStorage):