Merge branch 'develop' into felixdivo-fix-1275

Author: felixdivo

can/interfaces/neousys/neousys.py

@@ -131,7 +131,7 @@ class NeousysCanBitClk(Structure):
         NEOUSYS_CANLIB = CDLL("libwdt_dio.so")
     logger.info("Loaded Neousys WDT_DIO Can driver")
 except OSError as error:
-    logger.info("Cannot load Neousys CAN bus dll or shared object: %d", format(error))
+    logger.info("Cannot load Neousys CAN bus dll or shared object: %s", error)
 
 
 class NeousysBus(BusABC):

can/interfaces/socketcan/constants.py

@@ -58,8 +58,8 @@
 
 CANFD_MTU = 72
 
-STD_ACCEPTANCE_MASK_ALL_BITS = 2 ** 11 - 1
+STD_ACCEPTANCE_MASK_ALL_BITS = 2**11 - 1
 MAX_11_BIT_ID = STD_ACCEPTANCE_MASK_ALL_BITS
 
-EXT_ACCEPTANCE_MASK_ALL_BITS = 2 ** 29 - 1
+EXT_ACCEPTANCE_MASK_ALL_BITS = 2**29 - 1
 MAX_29_BIT_ID = EXT_ACCEPTANCE_MASK_ALL_BITS

can/interfaces/socketcan/socketcan.py

@@ -829,7 +829,7 @@ def _send_periodic_internal(
 
     def _get_next_task_id(self) -> int:
         with self._task_id_guard:
-            self._task_id = (self._task_id + 1) % (2 ** 32 - 1)
+            self._task_id = (self._task_id + 1) % (2**32 - 1)
             return self._task_id
 
     def _get_bcm_socket(self, channel: str) -> socket.socket:

can/interfaces/systec/ucan.py

@@ -120,7 +120,7 @@ def check_result(result, func, arguments):
 
     try:
         # Select the proper dll architecture
-        lib = WinDLL("usbcan64.dll" if sys.maxsize > 2 ** 32 else "usbcan32.dll")
+        lib = WinDLL("usbcan64.dll" if sys.maxsize > 2**32 else "usbcan32.dll")
 
         # BOOL PUBLIC UcanSetDebugMode (DWORD dwDbgLevel_p, _TCHAR* pszFilePathName_p, DWORD dwFlags_p);
         UcanSetDebugMode = lib.UcanSetDebugMode

can/interfaces/vector/canlib.py

@@ -82,7 +82,7 @@ def __init__(
         poll_interval: float = 0.01,
         receive_own_messages: bool = False,
         bitrate: Optional[int] = None,
-        rx_queue_size: int = 2 ** 14,
+        rx_queue_size: int = 2**14,
         app_name: Optional[str] = "CANalyzer",
         serial: Optional[int] = None,
         fd: bool = False,

can/io/canutils.py

@@ -160,6 +160,8 @@ def on_message_received(self, msg):
             timestamp = msg.timestamp
 
         channel = msg.channel if msg.channel is not None else self.channel
+        if isinstance(channel, int) or isinstance(channel, str) and channel.isdigit():
+            channel = f"can{channel}"
 
         framestr = "(%f) %s" % (timestamp, channel)
 

requirements-lint.txt

@@ -1,5 +1,5 @@
 pylint==2.12.2
-black==22.3.0
+black~=22.3.0
 mypy==0.931
 mypy-extensions==0.4.3
 types-setuptools

test/data/example_data.py

@@ -179,7 +179,7 @@ def generate_message(arbitration_id):
     Generates a new message with the given ID, some random data
     and a non-extended ID.
     """
-    data = bytearray([random.randrange(0, 2 ** 8 - 1) for _ in range(8)])
+    data = bytearray([random.randrange(0, 2**8 - 1) for _ in range(8)])
     return Message(
         arbitration_id=arbitration_id,
         data=data,

test/network_test.py

@@ -38,7 +38,7 @@ class ControllerAreaNetworkTestCase(unittest.TestCase):
 
     ids = list(range(num_messages))
     data = list(
-        bytearray([random.randrange(0, 2 ** 8 - 1) for a in range(random.randrange(9))])
+        bytearray([random.randrange(0, 2**8 - 1) for a in range(random.randrange(9))])
         for b in range(num_messages)
     )