aboutsummaryrefslogtreecommitdiff
path: root/oauth2client
diff options
context:
space:
mode:
authorJon Wayne Parrott <jonwayne@google.com>2016-07-27 13:44:02 -0700
committerJon Wayne Parrott <jonwayne@google.com>2016-07-27 13:44:02 -0700
commit2d270b0cf7e3cd9c513d185019edfa2f84503236 (patch)
tree846e7242e7d0dfd138309ac39ce811c6c9a044d1 /oauth2client
parentbb2386ea51b330765b7c44461465bdceb0be09b4 (diff)
downloadoauth2client-2d270b0cf7e3cd9c513d185019edfa2f84503236.tar.gz
Change Application Default Credentials resolution order.
Diffstat (limited to 'oauth2client')
-rw-r--r--oauth2client/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/oauth2client/client.py b/oauth2client/client.py
index 4efd492..e806358 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -1244,10 +1244,10 @@ class GoogleCredentials(OAuth2Credentials):
"""Gets credentials implicitly from the environment.
Checks environment in order of precedence:
- - Google App Engine (production and testing)
- Environment variable GOOGLE_APPLICATION_CREDENTIALS pointing to
a file with stored credentials information.
- Stored "well known" file associated with `gcloud` command line tool.
+ - Google App Engine (production and testing)
- Google Compute Engine production environment.
Raises:
@@ -1256,8 +1256,8 @@ class GoogleCredentials(OAuth2Credentials):
"""
# Environ checks (in order).
environ_checkers = [
- cls._implicit_credentials_from_gae,
cls._implicit_credentials_from_files,
+ cls._implicit_credentials_from_gae,
cls._implicit_credentials_from_gce,
]