tools/pyboard.py: Make it 8-bit clean, so it works with unicode chars.

dpgeorge · dpgeorge · commit 2bb5f41611dd · 2015-04-19T21:31:28.000+01:00
Addresses issue adafruit#1190.
diff --git a/tools/pyboard.py b/tools/pyboard.py
@@ -33,6 +33,9 @@
 import time
 import serial
 
+def stdout_write_bytes(b):
+    sys.stdout.buffer.write(b)
+
 class PyboardError(BaseException):
     pass
 
@@ -101,7 +104,7 @@ def exec_raw(self, command, timeout=10, data_consumer=None):
         if isinstance(command, bytes):
             command_bytes = command
         else:
-            command_bytes = bytes(command, encoding='ascii')
+            command_bytes = bytes(command, encoding='utf8')
 
         # write command
         for i in range(0, len(command_bytes), 256):
@@ -128,19 +131,19 @@ def exec(self, command):
         return ret
 
     def execfile(self, filename):
-        with open(filename) as f:
+        with open(filename, 'rb') as f:
             pyfile = f.read()
         return self.exec(pyfile)
 
     def get_time(self):
-        t = str(self.eval('pyb.RTC().datetime()'), encoding='ascii')[1:-1].split(', ')
+        t = str(self.eval('pyb.RTC().datetime()'), encoding='utf8')[1:-1].split(', ')
         return int(t[4]) * 3600 + int(t[5]) * 60 + int(t[6])
 
 def execfile(filename, device='/dev/ttyACM0'):
     pyb = Pyboard(device)
     pyb.enter_raw_repl()
     output = pyb.execfile(filename)
-    print(str(output, encoding='ascii'), end='')
+    stdout_write_bytes(output)
     pyb.exit_raw_repl()
     pyb.close()
 
@@ -214,24 +217,24 @@ def main():
     if len(args.files) == 0:
         try:
             pyb = Pyboard(args.device)
-            ret, ret_err = pyb.follow(timeout=None, data_consumer=lambda d:print(str(d, encoding='ascii'), end=''))
+            ret, ret_err = pyb.follow(timeout=None, data_consumer=stdout_write_bytes)
             pyb.close()
         except PyboardError as er:
             print(er)
             sys.exit(1)
         except KeyboardInterrupt:
             sys.exit(1)
         if ret_err:
-            print(str(ret_err, encoding='ascii'), end='')
+            stdout_write_bytes(ret_err)
             sys.exit(1)
 
     for filename in args.files:
         try:
             pyb = Pyboard(args.device)
             pyb.enter_raw_repl()
-            with open(filename) as f:
+            with open(filename, 'rb') as f:
                 pyfile = f.read()
-            ret, ret_err = pyb.exec_raw(pyfile, timeout=None, data_consumer=lambda d:print(str(d, encoding='ascii'), end=''))
+            ret, ret_err = pyb.exec_raw(pyfile, timeout=None, data_consumer=stdout_write_bytes)
             pyb.exit_raw_repl()
             pyb.close()
         except PyboardError as er:
@@ -240,7 +243,7 @@ def main():
         except KeyboardInterrupt:
             sys.exit(1)
         if ret_err:
-            print(str(ret_err, encoding='ascii'), end='')
+            stdout_write_bytes(ret_err)
             sys.exit(1)
 
 if __name__ == "__main__":
