deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 06:33:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Make sure that callGData and callGAPI return something

Browse Source
This commit is contained in:
Ross Scroggs
2015-12-17 17:11:17 -08:00
parent 4da936344f
commit 21f01757a3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam.py
View File

@ -417,7 +417,7 @@ def callGData(service, function, soft_errors=False, throw_errors=[], **kwargs):
if soft_errors: if soft_errors:
if n != 1: if n != 1:
sys.stderr.write(u' - Giving up.\n') sys.stderr.write(u' - Giving up.\n')
return return None
sys.exit(int(e.error_code)) sys.exit(int(e.error_code))
def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[], **kwargs): def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[], **kwargs):
@ -443,7 +443,7 @@ def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_re
if not silent_errors: if not silent_errors:
sys.stderr.write(u'{0}{1}\n'.format(ERROR_PREFIX, e.content)) sys.stderr.write(u'{0}{1}\n'.format(ERROR_PREFIX, e.content))
if soft_errors: if soft_errors:
return return None
sys.exit(5) sys.exit(5)
http_status = error[u'error'][u'code'] http_status = error[u'error'][u'code']
message = error[u'error'][u'errors'][0][u'message'] message = error[u'error'][u'errors'][0][u'message']
@ -467,7 +467,7 @@ def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_re
if soft_errors: if soft_errors:
if n != 1: if n != 1:
sys.stderr.write(u' - Giving up.\n') sys.stderr.write(u' - Giving up.\n')
return return None
sys.exit(int(http_status)) sys.exit(int(http_status))
except oauth2client.client.AccessTokenRefreshError, e: except oauth2client.client.AccessTokenRefreshError, e:
sys.stderr.write(u'{0}Authentication Token Error: {1}\n'.format(ERROR_PREFIX, e)) sys.stderr.write(u'{0}Authentication Token Error: {1}\n'.format(ERROR_PREFIX, e))