deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

always use httplib2 so we are consistent with TLS verify, debug output, etc

Browse Source
This commit is contained in:
Jay Lee
2017-01-25 08:53:33 -05:00
parent 7283e06750
commit dc626b1b3e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gam.py
View File

@@ -40,7 +40,6 @@ import random
import re import re
import socket import socket
import StringIO import StringIO
import urllib2
import googleapiclient import googleapiclient
import googleapiclient.discovery import googleapiclient.discovery
@@ -423,11 +422,11 @@ def doGAMCheckForUpdates(forceCheck=False):
return return
check_url = GAM_LATEST_RELEASE # latest full release check_url = GAM_LATEST_RELEASE # latest full release
headers = {u'Accept': u'application/vnd.github.v3.text+json'} headers = {u'Accept': u'application/vnd.github.v3.text+json'}
request = urllib2.Request(url=check_url, headers=headers) http = httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL])
try: try:
c = urllib2.urlopen(request) (_, c) = http.request(check_url, u'GET', headers=headers)
try: try:
release_data = json.loads(c.read()) release_data = json.loads(c)
except ValueError: except ValueError:
return return
if isinstance(release_data, list): if isinstance(release_data, list):
@@ -453,7 +452,7 @@ def doGAMCheckForUpdates(forceCheck=False):
sys.exit(0) sys.exit(0)
writeFile(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], str(now_time), continueOnError=True, displayError=forceCheck) writeFile(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], str(now_time), continueOnError=True, displayError=forceCheck)
return return
except (urllib2.HTTPError, urllib2.URLError): except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, httplib2.CertificateValidationUnsupported):
return return
def doGAMVersion(checkForArgs=True): def doGAMVersion(checkForArgs=True):
@@ -3099,10 +3098,11 @@ def doPhoto(users):
filename = filename.replace(u'#username#', user[:user.find(u'@')]) filename = filename.replace(u'#username#', user[:user.find(u'@')])
print u"Updating photo for %s with %s (%s/%s)" % (user, filename, i, count) print u"Updating photo for %s with %s (%s/%s)" % (user, filename, i, count)
if re.match(u'^(ht|f)tps?://.*$', filename): if re.match(u'^(ht|f)tps?://.*$', filename):
http = httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL])
try: try:
f = urllib2.urlopen(filename) (_, f) = http.request(filename, u'GET')
image_data = str(f.read()) image_data = str(f)
except urllib2.HTTPError as e: except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, httplib2.CertificateValidationUnsupported) as e:
print e print e
continue continue
else: else:
@@ -6291,8 +6291,8 @@ and accept the Terms of Service (ToS). As soon as you've accepted the ToS popup,
sys.exit(2) sys.exit(2)
break break
apis_url = u'https://raw.githubusercontent.com/jay0lee/GAM/master/src/project-apis.txt' apis_url = u'https://raw.githubusercontent.com/jay0lee/GAM/master/src/project-apis.txt'
request = urllib2.Request(url=apis_url) http = httplib2.Http(disable_ssl_certificate_validation=GC_Values[GC_NO_VERIFY_SSL])
apis = urllib2.urlopen(request).read().splitlines() _, apis = http.request(apis_url, u'GET').splitlines()
serveman = googleapiclient.discovery.build(u'servicemanagement', u'v1', http=http, cache_discovery=False) serveman = googleapiclient.discovery.build(u'servicemanagement', u'v1', http=http, cache_discovery=False)
for api in apis: for api in apis:
while True: while True: