openstack/deb-python-oauth2client
Code Issues Proposed changes

Merge pull request #118 from nanaze/master

Browse Source 
Modify invalid format exception error to give more context
This commit is contained in:
Craig Citro
2015-01-22 11:41:52 -08:00
parent f1cfa16bfd f438f5a4bd
commit 26d6429f53
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oauth2client/clientsecrets.py
View File

@@ -69,8 +69,18 @@ class InvalidClientSecretsError(Error):
def _validate_clientsecrets(obj): def _validate_clientsecrets(obj):
if obj is None or len(obj) != 1: _INVALID_FILE_FORMAT_MSG = (
raise InvalidClientSecretsError('Invalid file format.') 'Invalid file format. See '
'https://developers.google.com/api-client-library/'
'python/guide/aaa_client_secrets')
if obj is None:
raise InvalidClientSecretsError(_INVALID_FILE_FORMAT_MSG)
if len(obj) != 1:
raise InvalidClientSecretsError(
_INVALID_FILE_FORMAT_MSG + ' '
'Expected a JSON object with a single property for a "web" or '
'"installed" application')
client_type = tuple(obj)[0] client_type = tuple(obj)[0]
if client_type not in VALID_CLIENT: if client_type not in VALID_CLIENT:
raise InvalidClientSecretsError('Unknown client type: %s.' % (client_type,)) raise InvalidClientSecretsError('Unknown client type: %s.' % (client_type,))