From f948d674351a2ca87d33c0e0d8558cbbb2f59682 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 25 May 2020 19:33:47 -0400
Subject: Untested conversion to support Python 3

---
 projects/cli-test/filetransfer | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'projects/cli-test/filetransfer')

diff --git a/projects/cli-test/filetransfer b/projects/cli-test/filetransfer
index f704e31..147f081 100755
--- a/projects/cli-test/filetransfer
+++ b/projects/cli-test/filetransfer
@@ -37,7 +37,7 @@ import struct
 import serial
 import argparse
 
-from binascii import crc32
+from binascii import crc32, hexlify
 
 CHUNK_SIZE = 256
 DFU_CHUNK_SIZE = 256
@@ -79,19 +79,19 @@ def parse_args():
 def _write(dst, data):
     dst.write(data)
     if len(data) == 4:
-        print("Wrote 0x{!s}".format(data.encode('hex')))
+        print(("Wrote 0x{!s}".format(hexlify(data))))
     else:
-        print("Wrote {!r}".format(data))
+        print(("Wrote {!r}".format(data)))
 
 
 def _read(dst):
-    res = ''
+    res = b''
     while True:
         x = dst.read(1)
         if not x:
             break
         res += x
-    print ("Read {!r}".format(res))
+    print(("Read {!r}".format(res)))
     return res
 
 
@@ -142,19 +142,19 @@ def send_file(filename, args, dst):
         if not data:
             break
         dst.write(data)
-        print("Wrote {!s} bytes (chunk {!s}/{!s})".format(len(data), counter, int(size / chunk_size)))
+        print(("Wrote {!s} bytes (chunk {!s}/{!s})".format(len(data), counter, int(size / chunk_size))))
         # read ACK (a counter of number of 4k chunks received)
         while True:
             ack_bytes = dst.read(4)
             if len(ack_bytes) == 4:
                 break
-            print('ERROR: Did not receive an ACK, got {!r}'.format(ack_bytes))
+            print(('ERROR: Did not receive an ACK, got {!r}'.format(ack_bytes)))
             dst.write('\r')  # eventually get back to the CLI prompt
         ack = struct.unpack('<I', ack_bytes)[0]
         if ack != counter + 1:
-            print('ERROR: Did not receive the expected counter as ACK (got {!r}/{!r}, not {!r})'.format(ack, ack_bytes, counter))
+            print(('ERROR: Did not receive the expected counter as ACK (got {!r}/{!r}, not {!r})'.format(ack, ack_bytes, counter)))
             flush = dst.read(100)
-            print('FLUSH data: {!r}'.format(flush))
+            print(('FLUSH data: {!r}'.format(flush)))
             return False
         counter += 1
 
-- 
cgit v1.2.3