Fixed some python3 bugs in the test scripts and PandaSerial

python/__init__.py

@@ -135,11 +135,11 @@ class Panda(object):
   REQUEST_IN = usb1.ENDPOINT_IN | usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE
   REQUEST_OUT = usb1.ENDPOINT_OUT | usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE
 
-  HW_TYPE_UNKNOWN = '\x00'
-  HW_TYPE_WHITE_PANDA = '\x01'
-  HW_TYPE_GREY_PANDA = '\x02'
-  HW_TYPE_BLACK_PANDA = '\x03'
-  HW_TYPE_PEDAL = '\x04'
+  HW_TYPE_UNKNOWN = b'\x00'
+  HW_TYPE_WHITE_PANDA = b'\x01'
+  HW_TYPE_GREY_PANDA = b'\x02'
+  HW_TYPE_BLACK_PANDA = b'\x03'
+  HW_TYPE_PEDAL = b'\x04'
 
   def __init__(self, serial=None, claim=True):
     self._serial = serial
@@ -429,7 +429,7 @@ class Panda(object):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xde, bus, int(speed*10), b'')
 
   def set_uart_baud(self, uart, rate):
-    self._handle.controlWrite(Panda.REQUEST_OUT, 0xe4, uart, rate/300, b'')
+    self._handle.controlWrite(Panda.REQUEST_OUT, 0xe4, uart, int(rate/300), b'')
 
   def set_uart_parity(self, uart, parity):
     # parity, 0=off, 1=even, 2=odd

python/serial.py

@@ -5,7 +5,7 @@ class PandaSerial(object):
     self.port = port
     self.panda.set_uart_parity(self.port, 0)
     self.panda.set_uart_baud(self.port, baud)
-    self.buf = ""
+    self.buf = b""
 
   def read(self, l=1):
     tt = self.panda.serial_read(self.port)
@@ -19,7 +19,7 @@ class PandaSerial(object):
   def write(self, dat):
     #print "W: ", dat.encode("hex")
     #print '  pigeon_send("' + ''.join(map(lambda x: "\\x%02X" % ord(x), dat)) + '");'
-    return self.panda.serial_write(self.port, dat)
+    return self.panda.serial_write(self.port, str.encode(dat))
 
   def close(self):
     pass

tests/black_loopback_test.py

@@ -34,10 +34,7 @@ def run_test(sleep_duration):
   pandas[1] = Panda(pandas[1])
 
   # find out the hardware types  
-  type0 = pandas[0].get_type()
-  type1 = pandas[1].get_type()
-  
-  if type0 != "\x03" or type1 != "\x03":
+  if not pandas[0].is_black() or not pandas[1].is_black():
     print("Connect two black pandas to run this test!")
     assert False
 

tests/black_white_loopback_test.py

@@ -40,17 +40,14 @@ def run_test(sleep_duration):
   pandas[0] = Panda(pandas[0])
   pandas[1] = Panda(pandas[1])
 
-  # find out which one is black
-  type0 = pandas[0].get_type()
-  type1 = pandas[1].get_type()
-
   black_panda = None
   other_panda = None
 
-  if type0 == "\x03" and type1 != "\x03":
+  # find out which one is black
+  if pandas[0].is_black() and not pandas[1].is_black():
     black_panda = pandas[0]
     other_panda = pandas[1]
-  elif type0 != "\x03" and type1 == "\x03":
+  elif not pandas[0].is_black() and pandas[1].is_black():
     black_panda = pandas[1]
     other_panda = pandas[0]
   else:

tests/black_white_relay_endurance.py

@@ -40,17 +40,14 @@ def run_test(sleep_duration):
   pandas[0] = Panda(pandas[0])
   pandas[1] = Panda(pandas[1])
 
-  # find out which one is black
-  type0 = pandas[0].get_type()
-  type1 = pandas[1].get_type()
-
   black_panda = None
   other_panda = None
   
-  if type0 == "\x03" and type1 != "\x03":
+  # find out which one is black
+  if pandas[0].is_black() and not pandas[1].is_black():
     black_panda = pandas[0]
     other_panda = pandas[1]
-  elif type0 != "\x03" and type1 == "\x03":
+  elif not pandas[0].is_black() and pandas[1].is_black():
     black_panda = pandas[1]
     other_panda = pandas[0]
   else:

tests/debug_console.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
           while True:
             ret = panda.serial_read(port_number)
             if len(ret) > 0:
-	      sys.stdout.write(setcolor[i] + str(ret) + unsetcolor)
+              sys.stdout.write(setcolor[i] + ret.decode('ascii') + unsetcolor)
               sys.stdout.flush()
             else:
               break

tests/location_listener.py

@@ -41,7 +41,7 @@ if __name__ == "__main__":
   while True:
     ret = ser.read(1024)
     if len(ret) > 0:
-      sys.stdout.write(ret)
+      sys.stdout.write(ret.decode('ascii', 'ignore'))
       sys.stdout.flush()
       #print str(ret).encode("hex")