Skip to content

Commit

Permalink
Merge pull request #112 from craigcitro/adc
Browse files Browse the repository at this point in the history
Fix an ADC-related bug, and make an install tweak.
  • Loading branch information
craigcitro committed Jun 3, 2016
2 parents 95c9f82 + 80d4c3a commit e70991a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion apitools/base/py/credentials_lib.py
Expand Up @@ -642,5 +642,5 @@ def _GetApplicationDefaultCredentials(
# ADC will work.
cp = 'https://www.googleapis.com/auth/cloud-platform'
if not isinstance(credentials, gc) or cp in scopes:
return credentials
return credentials.create_scoped(scopes)
return None
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -47,7 +47,6 @@

CONSOLE_SCRIPTS = [
'gen_client = apitools.gen.gen_client:main',
'oauth2l = apitools.scripts.oauth2l:main',
]

py_version = platform.python_version()
Expand Down

0 comments on commit e70991a

Please sign in to comment.