projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes
[kiosk.git]
/
gdata_oauth.py
diff --git
a/gdata_oauth.py
b/gdata_oauth.py
index 64934ebf173831c93146d4a58cb9bb192b96c2a7..f88b2f5cd60a89874cf4845f69e9e5a866ea11a6 100644
(file)
--- a/
gdata_oauth.py
+++ b/
gdata_oauth.py
@@
-4,9
+4,9
@@
# https://developers.google.com/picasa-web/
import sys
# https://developers.google.com/picasa-web/
import sys
-import urllib
+import urllib
.request, urllib.parse, urllib.error
try:
try:
- import http
lib
# python2
+ import http
.client
# python2
except ImportError:
import http.client # python3
import os.path
except ImportError:
import http.client # python3
import os.path
@@
-16,9
+16,9
@@
from oauth2client.client import OAuth2Credentials
import gdata.calendar.service
import gdata.docs.service
import gdata.photos.service, gdata.photos
import gdata.calendar.service
import gdata.docs.service
import gdata.photos.service, gdata.photos
-from apiclient.discovery import build
+from
google
apiclient.discovery import build
import httplib2
import httplib2
-from apiclient.discovery import build
+from
google
apiclient.discovery import build
import datetime
import ssl
import datetime
import ssl
@@
-55,8
+55,8
@@
class OAuth:
# When this happens, we try re-creating the exception.
def reset_connection(self):
self.ssl_ctx = ssl.create_default_context(cafile='/usr/local/etc/ssl/cert.pem')
# When this happens, we try re-creating the exception.
def reset_connection(self):
self.ssl_ctx = ssl.create_default_context(cafile='/usr/local/etc/ssl/cert.pem')
- http
lib
.HTTPConnection.debuglevel = 2
- self.conn = http
lib
.HTTPSConnection(self.host, context=self.ssl_ctx)
+ http
.client
.HTTPConnection.debuglevel = 2
+ self.conn = http
.client
.HTTPSConnection(self.host, context=self.ssl_ctx)
def load_token(self):
token = None
def load_token(self):
token = None
@@
-82,7
+82,7
@@
class OAuth:
self.conn.request(
"POST",
"/o/oauth2/device/code",
self.conn.request(
"POST",
"/o/oauth2/device/code",
- urllib.urlencode({
+ urllib.
parse.
urlencode({
'client_id': self.client_id,
'scope' : ' '.join(self.scope)
}),
'client_id': self.client_id,
'scope' : ' '.join(self.scope)
}),
@@
-95,8
+95,8
@@
class OAuth:
self.verification_url = data['verification_url']
self.retry_interval = data['interval']
else:
self.verification_url = data['verification_url']
self.retry_interval = data['interval']
else:
- print(
"gdata: %d" % response.status
)
- print(
response.read(
))
+ print(
("gdata: %d" % response.status)
)
+ print(
(response.read()
))
sys.exit()
return self.user_code
sys.exit()
return self.user_code
@@
-110,7
+110,7
@@
class OAuth:
self.conn.request(
"POST",
"/o/oauth2/token",
self.conn.request(
"POST",
"/o/oauth2/token",
- urllib.urlencode({
+ urllib.
parse.
urlencode({
'client_id' : self.client_id,
'client_secret' : self.client_secret,
'code' : self.device_code,
'client_id' : self.client_id,
'client_secret' : self.client_secret,
'code' : self.device_code,
@@
-127,8
+127,8
@@
class OAuth:
time.sleep(self.retry_interval + 2)
else:
print("gdata: failed to get token")
time.sleep(self.retry_interval + 2)
else:
print("gdata: failed to get token")
- print(
response.status
)
- print(
response.read(
))
+ print(
(response.status)
)
+ print(
(response.read()
))
def refresh_token(self):
if self.checking_too_often():
def refresh_token(self):
if self.checking_too_often():
@@
-141,7
+141,7
@@
class OAuth:
self.conn.request(
"POST",
"/o/oauth2/token",
self.conn.request(
"POST",
"/o/oauth2/token",
- urllib.urlencode({
+ urllib.
parse.
urlencode({
'client_id' : self.client_id,
'client_secret' : self.client_secret,
'refresh_token' : refresh_token,
'client_id' : self.client_id,
'client_secret' : self.client_secret,
'refresh_token' : refresh_token,
@@
-160,8
+160,8
@@
class OAuth:
self.token['refresh_token'] = refresh_token
self.save_token()
return True
self.token['refresh_token'] = refresh_token
self.save_token()
return True
- print(
"gdata: unexpected response %d to renewal request" % response.status
)
- print(
response.read(
))
+ print(
("gdata: unexpected response %d to renewal request" % response.status)
)
+ print(
(response.read()
))
return False
def checking_too_often(self):
return False
def checking_too_often(self):