deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 01:41:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jay0lee/GAM

Browse Source
This commit is contained in:
Jay Lee
2019-06-12 13:42:48 -04:00
parent 6854e3729a 5f48b1e16f
commit f86be17834
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gam.py
View File

@@ -801,7 +801,7 @@ def doGAMCheckForUpdates(forceCheck=False):
sys.exit(0)
writeFile(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], str(now_time), continueOnError=True, displayError=forceCheck)
return
except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError):
except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, RuntimeError):
return
def doGAMVersion(checkForArgs=True):
@@ -850,7 +850,7 @@ def _getServerTLSUsed(location):
headers = {'user-agent': GAM_INFO}
try:
httpc.request(url, headers=headers)
except httplib2.ServerNotFoundError as e:
except (httplib2.ServerNotFoundError, RuntimeError) as e:
systemErrorExit(4, e)
cipher_name, tls_ver, _ = httpc.connections[conn].sock.cipher()
return tls_ver, cipher_name
@@ -1092,7 +1092,7 @@ def callGAPI(service, function,
service._http.cache = None
continue
systemErrorExit(4, str(e))
except (TypeError, httplib2.ServerNotFoundError) as e:
except (TypeError, httplib2.ServerNotFoundError, RuntimeError) as e:
systemErrorExit(4, str(e))
def callGAPIpages(service, function, items='items',
@@ -1282,7 +1282,7 @@ def getService(api, http):
if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
http.cache = None
return service
except httplib2.ServerNotFoundError as e:
except (httplib2.ServerNotFoundError, RuntimeError) as e:
systemErrorExit(4, str(e))
except (googleapiclient.errors.InvalidJsonError, KeyError, ValueError) as e:
http.cache = None
@@ -1413,7 +1413,7 @@ def buildGAPIServiceObject(api, act_as, showAuthError=True):
try:
credentials.refresh(request)
service._http = google_auth_httplib2.AuthorizedHttp(credentials, http=http)
except httplib2.ServerNotFoundError as e:
except (httplib2.ServerNotFoundError, RuntimeError) as e:
systemErrorExit(4, e)
except google.auth.exceptions.RefreshError as e:
if isinstance(e.args, tuple):
@@ -1478,7 +1478,7 @@ def doCheckServiceAccount(users):
request = google_auth_httplib2.Request(_createHttpObj())
credentials.refresh(request)
result = 'PASS'
except httplib2.ServerNotFoundError as e:
except (httplib2.ServerNotFoundError, RuntimeError) as e:
systemErrorExit(4, e)
except google.auth.exceptions.RefreshError:
result = 'FAIL'