Merge 7f6e089 into 834c68b

faucamp · Jul 19, 2016 · 5da1318 · 5da1318
2 parents 834c68b + 7f6e089
commit 5da1318
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/gsmmodem/serial_comms.py b/gsmmodem/serial_comms.py
@@ -91,6 +91,11 @@ def _readLoop(self):
             rxBuffer = []
             while self.alive:
                 data = self.serial.read(1)
+                if isinstance(data, bytes):
+                    try:
+                        data = data.decode()
+                    except UnicodeDecodeError:
+                        data = ''
                 if data != '': # check for timeout
                     #print >> sys.stderr, ' RX:', data,'({0})'.format(ord(data))
                     rxBuffer.append(data)
@@ -118,6 +123,8 @@ def _readLoop(self):
             self.fatalErrorCallback(e)
 
     def write(self, data, waitForResponse=True, timeout=5, expectedResponseTermSeq=None):
+        if isinstance(data, str):
+            data = data.encode()
         with self._txLock:            
             if waitForResponse:
                 if expectedResponseTermSeq: