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

Fix for Python 3 (#913)

Browse Source 
* Fix for Python 3

* Another fix for Python 3
This commit is contained in:
Ross Scroggs
2019-05-03 14:58:31 -07:00
committed by Jay Lee
parent 187b7a8c39
commit 1046716304
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam.py
View File

@@ -3622,6 +3622,8 @@ def doCancelPrintJob():
print('Print Job %s cancelled' % job)
def checkCloudPrintResult(result):
if isinstance(result, bytes):
result = result.decode(UTF8)
if isinstance(result, str):
try:
result = json.loads(result)
@@ -5741,7 +5743,8 @@ def addSmime(users):
myarg = sys.argv[i].lower()
if myarg == 'file':
smimefile = sys.argv[i+1]
body['pkcs12'] = base64.urlsafe_b64encode(readFile(smimefile, mode='rb'))
smimeData = readFile(smimefile, mode='rb')
body['pkcs12'] = base64.urlsafe_b64encode(smimeData).decode(UTF8)
i += 2
elif myarg == 'password':
body['encryptedKeyPassword'] = sys.argv[i+1]