Update linters (#1534)

zariiii9003 · web-flow · commit 40968170de9f · 2023-03-07T08:41:51.000+01:00
* update black to 23.1.0

* update mypy to 1.0.1

* update pylint to 2.16.4

* remove useless suppression

* fix warning
diff --git a/.pylintrc b/.pylintrc
@@ -498,5 +498,5 @@ min-public-methods=2
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception
diff --git a/can/bus.py b/can/bus.py
@@ -93,7 +93,6 @@ def recv(self, timeout: Optional[float] = None) -> Optional[Message]:
         time_left = timeout
 
         while True:
-
             # try to get a message
             msg, already_filtered = self._recv_internal(timeout=time_left)
 
@@ -109,7 +108,6 @@ def recv(self, timeout: Optional[float] = None) -> Optional[Message]:
             # try next one only if there still is time, and with
             # reduced timeout
             else:
-
                 time_left = timeout - (time() - start)
 
                 if time_left > 0:
diff --git a/can/interface.py b/can/interface.py
@@ -171,7 +171,6 @@ def detect_available_configs(
 
     result = []
     for interface in interfaces:
-
         try:
             bus_class = _get_class_for_interface(interface)
         except CanInterfaceNotImplementedError:
diff --git a/can/interfaces/__init__.py b/can/interfaces/__init__.py
@@ -35,7 +35,8 @@
 if sys.version_info >= (3, 8):
     from importlib.metadata import entry_points
 
-    # See https://docs.python.org/3/library/importlib.metadata.html#entry-points, "Compatibility Note".
+    # See https://docs.python.org/3/library/importlib.metadata.html#entry-points,
+    # "Compatibility Note".
     if sys.version_info >= (3, 10):
         BACKENDS.update(
             {
diff --git a/can/interfaces/ics_neovi/neovi_bus.py b/can/interfaces/ics_neovi/neovi_bus.py
@@ -40,7 +40,6 @@
 try:
     from filelock import FileLock
 except ImportError as ie:
-
     logger.warning(
         "Using ICS neoVI can backend without the "
         "filelock module installed may cause some issues!: %s",
diff --git a/can/interfaces/iscan.py b/can/interfaces/iscan.py
@@ -157,7 +157,6 @@ def shutdown(self) -> None:
 
 
 class IscanError(CanError):
-
     ERROR_CODES = {
         0: "Success",
         1: "No access to device",
diff --git a/can/interfaces/pcan/basic.py b/can/interfaces/pcan/basic.py
@@ -670,6 +670,7 @@ class TPCANChannelInformation(Structure):
 # PCAN-Basic API function declarations
 # ///////////////////////////////////////////////////////////
 
+
 # PCAN-Basic API class implementation
 #
 class PCANBasic:
@@ -719,7 +720,6 @@ def Initialize(
         IOPort=c_uint(0),
         Interrupt=c_ushort(0),
     ):
-
         """Initializes a PCAN Channel
 
         Parameters:
@@ -744,7 +744,6 @@ def Initialize(
     # Initializes a FD capable PCAN Channel
     #
     def InitializeFD(self, Channel, BitrateFD):
-
         """Initializes a FD capable PCAN Channel
 
         Parameters:
@@ -775,7 +774,6 @@ def InitializeFD(self, Channel, BitrateFD):
     #  Uninitializes one or all PCAN Channels initialized by CAN_Initialize
     #
     def Uninitialize(self, Channel):
-
         """Uninitializes one or all PCAN Channels initialized by CAN_Initialize
 
         Remarks:
@@ -797,7 +795,6 @@ def Uninitialize(self, Channel):
     #  Resets the receive and transmit queues of the PCAN Channel
     #
     def Reset(self, Channel):
-
         """Resets the receive and transmit queues of the PCAN Channel
 
         Remarks:
@@ -819,7 +816,6 @@ def Reset(self, Channel):
     #  Gets the current status of a PCAN Channel
     #
     def GetStatus(self, Channel):
-
         """Gets the current status of a PCAN Channel
 
         Parameters:
@@ -838,7 +834,6 @@ def GetStatus(self, Channel):
     # Reads a CAN message from the receive queue of a PCAN Channel
     #
     def Read(self, Channel):
-
         """Reads a CAN message from the receive queue of a PCAN Channel
 
         Remarks:
@@ -867,7 +862,6 @@ def Read(self, Channel):
     # Reads a CAN message from the receive queue of a FD capable PCAN Channel
     #
     def ReadFD(self, Channel):
-
         """Reads a CAN message from the receive queue of a FD capable PCAN Channel
 
         Remarks:
@@ -896,7 +890,6 @@ def ReadFD(self, Channel):
     # Transmits a CAN message
     #
     def Write(self, Channel, MessageBuffer):
-
         """Transmits a CAN message
 
         Parameters:
@@ -916,7 +909,6 @@ def Write(self, Channel, MessageBuffer):
     # Transmits a CAN message over a FD capable PCAN Channel
     #
     def WriteFD(self, Channel, MessageBuffer):
-
         """Transmits a CAN message over a FD capable PCAN Channel
 
         Parameters:
@@ -936,7 +928,6 @@ def WriteFD(self, Channel, MessageBuffer):
     # Configures the reception filter
     #
     def FilterMessages(self, Channel, FromID, ToID, Mode):
-
         """Configures the reception filter
 
         Remarks:
@@ -963,7 +954,6 @@ def FilterMessages(self, Channel, FromID, ToID, Mode):
     # Retrieves a PCAN Channel value
     #
     def GetValue(self, Channel, Parameter):
-
         """Retrieves a PCAN Channel value
 
         Remarks:
@@ -1026,7 +1016,6 @@ def GetValue(self, Channel, Parameter):
     # error code, in any desired language
     #
     def SetValue(self, Channel, Parameter, Buffer):
-
         """Returns a descriptive text of a given TPCANStatus error
         code, in any desired language
 
@@ -1069,7 +1058,6 @@ def SetValue(self, Channel, Parameter, Buffer):
             raise
 
     def GetErrorText(self, Error, Language=0):
-
         """Configures or sets a PCAN Channel value
 
         Remarks:
@@ -1098,7 +1086,6 @@ def GetErrorText(self, Error, Language=0):
             raise
 
     def LookUpChannel(self, Parameters):
-
         """Finds a PCAN-Basic channel that matches with the given parameters
 
         Remarks:
diff --git a/can/interfaces/serial/serial_can.py b/can/interfaces/serial/serial_can.py
@@ -175,7 +175,6 @@ def _recv_internal(
         try:
             rx_byte = self._ser.read()
             if rx_byte and ord(rx_byte) == 0xAA:
-
                 s = self._ser.read(4)
                 timestamp = struct.unpack("<I", s)[0]
                 dlc = ord(self._ser.read())
diff --git a/can/interfaces/slcan.py b/can/interfaces/slcan.py
@@ -193,7 +193,6 @@ def close(self) -> None:
     def _recv_internal(
         self, timeout: Optional[float]
     ) -> Tuple[Optional[Message], bool]:
-
         canId = None
         remote = False
         extended = False
diff --git a/can/interfaces/udp_multicast/bus.py b/can/interfaces/udp_multicast/bus.py
@@ -239,7 +239,6 @@ def _create_socket(self, address_family: socket.AddressFamily) -> socket.socket:
 
         # configure the socket
         try:
-
             # set hop limit / TTL
             ttl_as_binary = struct.pack("@I", self.hop_limit)
             if self.ip_version == 4:
diff --git a/can/interfaces/usb2can/usb2canInterface.py b/can/interfaces/usb2can/usb2canInterface.py
@@ -99,7 +99,6 @@ def __init__(
         serial: Optional[str] = None,
         **kwargs,
     ):
-
         self.can = Usb2CanAbstractionLayer(dll)
 
         # get the serial number of the device
@@ -134,7 +133,6 @@ def send(self, msg, timeout=None):
             raise CanOperationError("could not send message", error_code=status)
 
     def _recv_internal(self, timeout):
-
         messagerx = CanalMsg()
 
         if timeout == 0:
diff --git a/can/interfaces/virtual.py b/can/interfaces/virtual.py
@@ -74,7 +74,6 @@ def __init__(
         self._open = True
 
         with channels_lock:
-
             # Create a new channel if one does not exist
             if self.channel_id not in channels:
                 channels[self.channel_id] = []
diff --git a/can/io/asc.py b/can/io/asc.py
@@ -174,7 +174,6 @@ def _process_data_string(
     def _process_classic_can_frame(
         self, line: str, msg_kwargs: Dict[str, Any]
     ) -> Message:
-
         # CAN error frame
         if line.strip()[0:10].lower() == "errorframe":
             # Error Frame
@@ -423,7 +422,6 @@ def log_event(self, message: str, timestamp: Optional[float] = None) -> None:
         self.file.write(line)
 
     def on_message_received(self, msg: Message) -> None:
-
         if msg.is_error_frame:
             self.log_event(f"{self.channel}  ErrorFrame", msg.timestamp)
             return
diff --git a/can/io/canutils.py b/can/io/canutils.py
@@ -48,7 +48,6 @@ def __init__(
 
     def __iter__(self) -> Generator[Message, None, None]:
         for line in self.file:
-
             # skip empty lines
             temp = line.strip()
             if not temp:
diff --git a/can/io/csv.py b/can/io/csv.py
@@ -49,7 +49,6 @@ def __iter__(self) -> Generator[Message, None, None]:
             return
 
         for line in self.file:
-
             timestamp, arbitration_id, extended, remote, error, dlc, data = line.split(
                 ","
             )
diff --git a/can/io/logger.py b/can/io/logger.py
@@ -237,7 +237,7 @@ def _get_new_writer(self, filename: StringPathLike) -> FileIOMessageWriter:
             elif isinstance(logger, Printer) and logger.file is not None:
                 return cast(FileIOMessageWriter, logger)
 
-        raise Exception(
+        raise ValueError(
             f'The log format "{suffix}" '
             f"is not supported by {self.__class__.__name__}. "
             f"{self.__class__.__name__} supports the following formats: "
diff --git a/can/io/player.py b/can/io/player.py
@@ -139,7 +139,6 @@ def __iter__(self) -> typing.Generator[Message, None, None]:
         t_skipped = 0.0
 
         for message in self.raw_messages:
-
             # Work out the correct wait time
             if self.timestamps:
                 if recorded_start_time is None:
diff --git a/can/logconvert.py b/can/logconvert.py
@@ -46,7 +46,6 @@ def main():
     args = parser.parse_args()
 
     with LogReader(args.input) as reader:
-
         if args.file_size:
             logger = SizedRotatingLogger(
                 base_filename=args.output, max_bytes=args.file_size
diff --git a/can/player.py b/can/player.py
@@ -87,7 +87,6 @@ def main() -> None:
 
     with _create_bus(results, **additional_config) as bus:
         with LogReader(results.infile, **additional_config) as reader:
-
             in_sync = MessageSync(
                 cast(Iterable[Message], reader),
                 timestamps=results.timestamps,
diff --git a/can/thread_safe_bus.py b/can/thread_safe_bus.py
@@ -58,9 +58,7 @@ def __init__(self, *args, **kwargs):
 
         # now, BusABC.send_periodic() does not need a lock anymore, but the
         # implementation still requires a context manager
-        # pylint: disable=protected-access
         self.__wrapped__._lock_send_periodic = nullcontext()
-        # pylint: enable=protected-access
 
         # init locks for sending and receiving separately
         self._lock_send = RLock()
diff --git a/examples/print_notifier.py b/examples/print_notifier.py
@@ -5,7 +5,6 @@
 
 
 def main():
-
     with can.Bus(receive_own_messages=True) as bus:
         print_listener = can.Printer()
         can.Notifier(bus, [print_listener])
diff --git a/examples/receive_all.py b/examples/receive_all.py
@@ -14,7 +14,6 @@ def receive_all():
     # this uses the default configuration (for example from environment variables, or a
     # config file) see https://python-can.readthedocs.io/en/stable/configuration.html
     with can.Bus() as bus:
-
         # set to read-only, only supported on some interfaces
         try:
             bus.state = BusState.PASSIVE
diff --git a/examples/send_one.py b/examples/send_one.py
@@ -13,7 +13,6 @@ def send_one():
     # this uses the default configuration (for example from the config file)
     # see https://python-can.readthedocs.io/en/stable/configuration.html
     with can.Bus() as bus:
-
         # Using specific buses works similar:
         # bus = can.Bus(interface='socketcan', channel='vcan0', bitrate=250000)
         # bus = can.Bus(interface='pcan', channel='PCAN_USBBUS1', bitrate=250000)
diff --git a/examples/serial_com.py b/examples/serial_com.py
@@ -50,7 +50,6 @@ def main():
     """Controls the sender and receiver."""
     with can.Bus(interface="serial", channel="/dev/ttyS10") as server:
         with can.Bus(interface="serial", channel="/dev/ttyS11") as client:
-
             tx_msg = can.Message(
                 arbitration_id=0x01,
                 data=[0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88],
diff --git a/examples/simple_log_converter.py b/examples/simple_log_converter.py
@@ -17,8 +17,7 @@ def main():
 
     with can.LogReader(sys.argv[1]) as reader:
         with can.Logger(sys.argv[2]) as writer:
-
-            for msg in reader:  # pylint: disable=not-an-iterable
+            for msg in reader:
                 writer.on_message_received(msg)
 
 
diff --git a/examples/vcan_filtered.py b/examples/vcan_filtered.py
@@ -12,7 +12,6 @@
 def main():
     """Send some messages to itself and apply filtering."""
     with can.Bus(interface="virtual", receive_own_messages=True) as bus:
-
         can_filters = [{"can_id": 1, "can_mask": 0xF, "extended": True}]
         bus.set_filters(can_filters)
 
diff --git a/requirements-lint.txt b/requirements-lint.txt
@@ -1,5 +1,5 @@
-pylint==2.15.9
-black~=22.10.0
-mypy==0.991
+pylint==2.16.4
+black~=23.1.0
+mypy==1.0.1
 mypy-extensions==0.4.3
 types-setuptools
diff --git a/setup.py b/setup.py
@@ -5,8 +5,6 @@
 Learn more at https://github.com/hardbyte/python-can/
 """
 
-# pylint: disable=invalid-name
-
 from os import listdir
 from os.path import isfile, join
 import re
diff --git a/test/back2back_test.py b/test/back2back_test.py
@@ -275,7 +275,6 @@ def test_sub_second_timestamp_resolution(self):
 
 @unittest.skipUnless(TEST_INTERFACE_SOCKETCAN, "skip testing of socketcan")
 class BasicTestSocketCan(Back2BackTestCase):
-
     INTERFACE_1 = "socketcan"
     CHANNEL_1 = "vcan0"
     INTERFACE_2 = "socketcan"
@@ -289,7 +288,6 @@ class BasicTestSocketCan(Back2BackTestCase):
     "only supported on Unix systems (but not on macOS at Travis CI and GitHub Actions)",
 )
 class BasicTestUdpMulticastBusIPv4(Back2BackTestCase):
-
     INTERFACE_1 = "udp_multicast"
     CHANNEL_1 = UdpMulticastBus.DEFAULT_GROUP_IPv4
     INTERFACE_2 = "udp_multicast"
@@ -329,7 +327,6 @@ def test_unique_message_instances(self):
 
 @unittest.skipUnless(TEST_INTERFACE_ETAS, "skip testing of etas interface")
 class BasicTestEtas(Back2BackTestCase):
-
     if TEST_INTERFACE_ETAS:
         configs = can.interface.detect_available_configs(interfaces="etas")
 
diff --git a/test/serial_test.py b/test/serial_test.py
diff --git a/test/simplecyclic_test.py b/test/simplecyclic_test.py
diff --git a/test/test_pcan.py b/test/test_pcan.py
diff --git a/test/test_player.py b/test/test_player.py
diff --git a/test/test_util.py b/test/test_util.py

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`if sys.version_info >= (3, 8):`
`36`	`36`	`from importlib.metadata import entry_points`
`37`	`37`
`38`		`- # See https://docs.python.org/3/library/importlib.metadata.html#entry-points, "Compatibility Note".`
	`38`	`+ # See https://docs.python.org/3/library/importlib.metadata.html#entry-points,`
	`39`	`+ # "Compatibility Note".`
`39`	`40`	`if sys.version_info >= (3, 10):`
`40`	`41`	`BACKENDS.update(`
`41`	`42`	`{`