From 39f5b1dbc2fcf7e842c6876c007398168678a16a Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Thu, 9 May 2019 12:04:56 -0400
Subject: [PATCH] more GCP fixes, testing

---
 .travis.yml | 8 ++++----
 src/gam.py  | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74622c4b..eff27e59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -171,15 +171,15 @@ script:
 - $gam calendar $newuser add editor $gam_user
 - $gam calendar $newuser showacl
 - $gam printer register
-- export GAM_CSV_ROW_FILTER="{\"type\": \"regex:^GOOGLE\$\"}"
+- export GAM_CSV_ROW_FILTER='{"type": "regex:^GOOGLE"}'
 - $gam print printers > printers.csv
 - unset GAM_CSV_ROW_FILTER
 - $gam csv printers.csv gam printer ~id add USER $newgroup
-- $gam csv printers.csv gam printjob ~id submit https://www.google.com
+- $gam csv printers.csv gam printjob ~id submit https://www.github.com/jay0lee/GAM
 - $gam csv printers.csv gam info printer ~id
-- $gam print printers
 - $gam print printjobs
-
+- $gam csv printers.csv gam printjob ~id fetch
+- $gam csv printers.csv gam delete printer ~id
 #- $gam calendar id:$newresource add editor $newuser
 #- $gam calendar id:$newresource update read domain
 #- $gam calendar id:$newresource showacl
diff --git a/src/gam.py b/src/gam.py
index 6e49c7d0..a566c295 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -3467,7 +3467,7 @@ def doPrintJobFetch():
       jobid = job['id']
       fileName = os.path.join(targetFolder, '{0}-{1}'.format(''.join(c if c in valid_chars else '_' for c in job['title']), jobid))
       _, content = cp._http.request(uri=fileUrl, method='GET')
-      if writeFile(fileName, content, continueOnError=True):
+      if writeFile(fileName, content, mode='wb', continueOnError=True):
 #        ticket = callGAPI(cp.jobs(), u'getticket', jobid=jobid, use_cjt=True)
         result = callGAPI(cp.jobs(), 'update', jobid=jobid, semantic_state_diff=ssd)
         checkCloudPrintResult(result)
@@ -3620,6 +3620,8 @@ def doPrintJobSubmit():
   #Get the printer first to make sure our OAuth access token is fresh
   callGAPI(cp.printers(), 'get', printerid=printer)
   _, result = cp._http.request(uri='https://www.google.com/cloudprint/submit', method='POST', body=body, headers=headers)
+  result = result.decode(UTF8)
+  result = json.loads(result)
   checkCloudPrintResult(result)
   if isinstance(result, str):
     result = json.loads(result)