reformat using black

Alberto Scotta · Alberto Scotta · commit ba2a4570ac55 · 2019-06-02T10:16:27.000+02:00
diff --git a/can/interfaces/slcan.py b/can/interfaces/slcan.py
@@ -84,10 +84,8 @@ def __init__(
 
         if not channel:  # if None or empty
             raise TypeError("Must specify a serial port.")
-
         if "@" in channel:
             (channel, ttyBaudrate) = channel.split("@")
-
         self.serialPortOrig = serial.serial_for_url(
             channel, baudrate=ttyBaudrate, rtscts=rtscts
         )
@@ -98,13 +96,10 @@ def __init__(
 
         if bitrate is not None and btr is not None:
             raise ValueError("Bitrate and btr mutually exclusive.")
-
         if bitrate is not None:
             self.set_bitrate(self, bitrate)
-
         if btr is not None:
             self.set_bitrate_reg(self, btr)
-
         self.open()
 
         super().__init__(
@@ -117,8 +112,7 @@ def set_bitrate(self, bitrate):
             self.write(self._BITRATES[bitrate])
         else:
             raise ValueError(
-                "Invalid bitrate, choose one of " +
-                (", ".join(self._BITRATES)) + "."
+                "Invalid bitrate, choose one of " + (", ".join(self._BITRATES)) + "."
             )
         self.open()
 
@@ -136,19 +130,14 @@ def read(self, timeout):
         # first read what is already in receive buffer
         while self.serialPortOrig.in_waiting:
             self._buffer += self.serialPortOrig.read()
-
         # if we still don't have a complete message, do a blocking read
         start = time.time()
         time_left = timeout
-        while not (
-                ord(self._OK) in self._buffer or
-                ord(self._ERROR) in self._buffer
-            ):
+        while not (ord(self._OK) in self._buffer or ord(self._ERROR) in self._buffer):
             self.serialPortOrig.timeout = time_left
             byte = self.serialPortOrig.read()
             if byte:
                 self._buffer += byte
-
             # if timeout is None, try indefinitely
             if timeout is None:
                 continue
@@ -160,15 +149,12 @@ def read(self, timeout):
                     continue
                 else:
                     return None
-
         # return first message
         for i in range(len(self._buffer)):
-            if (    self._buffer[i] == ord(self._OK) or
-                    self._buffer[i] == ord(self._ERROR)    ):
-                string = self._buffer[:i+1].decode()
-                del self._buffer[:i+1]
+            if self._buffer[i] == ord(self._OK) or self._buffer[i] == ord(self._ERROR):
+                string = self._buffer[: i + 1].decode()
+                del self._buffer[: i + 1]
                 break
-
         return string
 
     def flush(self):
@@ -217,7 +203,6 @@ def _recv_internal(self, timeout):
             dlc = int(string[9])
             extended = True
             remote = True
-
         if canId is not None:
             msg = Message(
                 arbitration_id=canId,
@@ -233,7 +218,6 @@ def _recv_internal(self, timeout):
     def send(self, msg, timeout=None):
         if timeout != self.serialPortOrig.write_timeout:
             self.serialPortOrig.write_timeout = timeout
-
         if msg.is_remote_frame:
             if msg.is_extended_id:
                 sendStr = "R%08X%d" % (msg.arbitration_id, msg.dlc)
@@ -244,7 +228,6 @@ def send(self, msg, timeout=None):
                 sendStr = "T%08X%d" % (msg.arbitration_id, msg.dlc)
             else:
                 sendStr = "t%03X%d" % (msg.arbitration_id, msg.dlc)
-
             sendStr += "".join(["%02X" % b for b in msg.data])
         self.write(sendStr)
 
@@ -274,7 +257,6 @@ def get_version(self, timeout):
                 hw_version = int(string[1:3])
                 sw_version = int(string[3:5])
                 return hw_version, sw_version
-
             # if timeout is None, try indefinitely
             if timeout is None:
                 continue
@@ -301,7 +283,6 @@ def get_serial_number(self, timeout):
             elif string[0] == cmd and len(string) == 6:
                 serial_number = string[1:-1]
                 return serial_number
-
             # if timeout is None, try indefinitely
             if timeout is None:
                 continue
diff --git a/test/test_slcan.py b/test/test_slcan.py
@@ -106,7 +106,7 @@ def test_partial_recv(self):
         self.assertIsNotNone(msg)
 
     def test_version(self):
-        self.serial.write(b'V1013\r')
+        self.serial.write(b"V1013\r")
         hw_ver, sw_ver = self.bus.get_version(0)
         self.assertEqual(hw_ver, 10)
         self.assertEqual(sw_ver, 13)
@@ -116,7 +116,7 @@ def test_version(self):
         self.assertIsNone(sw_ver)
 
     def test_serial_number(self):
-        self.serial.write(b'NA123\r')
+        self.serial.write(b"NA123\r")
         sn = self.bus.get_serial_number(0)
         self.assertEqual(sn, "A123")
 
