activate ruff pycodestyle checks (#1602)

Author: zariiii9003

can/__init__.py

@@ -76,10 +76,6 @@
     "viewer",
 ]
 
-log = logging.getLogger("can")
-
-rc: Dict[str, Any] = {}
-
 from . import typechecking  # isort:skip
 from . import util  # isort:skip
 from . import broadcastmanager, interface
@@ -127,3 +123,7 @@
 from .notifier import Notifier
 from .thread_safe_bus import ThreadSafeBus
 from .util import set_logging_level
+
+log = logging.getLogger("can")
+
+rc: Dict[str, Any] = {}

can/interfaces/ixxat/canlib_vcinpl2.py

@@ -13,6 +13,7 @@
 import functools
 import logging
 import sys
+import time
 import warnings
 from typing import Callable, Optional, Sequence, Tuple, Union
 
@@ -43,8 +44,6 @@
 
 log = logging.getLogger("can.ixxat")
 
-from time import perf_counter
-
 # Hack to have vciFormatError as a free function, see below
 vciFormatError = None
 
@@ -144,7 +143,7 @@ def __check_status(result, function, args):
         _canlib.map_symbol(
             "vciFormatError", None, (ctypes_HRESULT, ctypes.c_char_p, ctypes.c_uint32)
         )
-    except:
+    except ImportError:
         _canlib.map_symbol(
             "vciFormatErrorA", None, (ctypes_HRESULT, ctypes.c_char_p, ctypes.c_uint32)
         )
@@ -812,7 +811,7 @@ def _recv_internal(self, timeout):
             else:
                 timeout_ms = int(timeout * 1000)
                 remaining_ms = timeout_ms
-                t0 = perf_counter()
+                t0 = time.perf_counter()
 
             while True:
                 try:
@@ -861,7 +860,7 @@ def _recv_internal(self, timeout):
                         log.warning("Unexpected message info type")
 
                 if t0 is not None:
-                    remaining_ms = timeout_ms - int((perf_counter() - t0) * 1000)
+                    remaining_ms = timeout_ms - int((time.perf_counter() - t0) * 1000)
                     if remaining_ms < 0:
                         break
 

can/interfaces/socketcan/socketcan.py

@@ -17,6 +17,17 @@
 import warnings
 from typing import Callable, Dict, List, Optional, Sequence, Tuple, Type, Union
 
+import can
+from can import BusABC, CanProtocol, Message
+from can.broadcastmanager import (
+    LimitedDurationCyclicSendTaskABC,
+    ModifiableCyclicTaskABC,
+    RestartableCyclicTaskABC,
+)
+from can.interfaces.socketcan import constants
+from can.interfaces.socketcan.utils import find_available_interfaces, pack_filters
+from can.typechecking import CanFilters
+
 log = logging.getLogger(__name__)
 log_tx = log.getChild("tx")
 log_rx = log.getChild("rx")
@@ -30,18 +41,6 @@
     log.error("socket.CMSG_SPACE not available on this platform")
 
 
-import can
-from can import BusABC, CanProtocol, Message
-from can.broadcastmanager import (
-    LimitedDurationCyclicSendTaskABC,
-    ModifiableCyclicTaskABC,
-    RestartableCyclicTaskABC,
-)
-from can.interfaces.socketcan import constants
-from can.interfaces.socketcan.utils import find_available_interfaces, pack_filters
-from can.typechecking import CanFilters
-
-
 # Setup BCM struct
 def bcm_header_factory(
     fields: List[Tuple[str, Union[Type[ctypes.c_uint32], Type[ctypes.c_long]]]],

can/interfaces/vector/canlib.py

@@ -4,8 +4,6 @@
 Authors: Julien Grave <[email protected]>, Christian Sandberg
 """
 
-# Import Standard Python Modules
-# ==============================
 import contextlib
 import ctypes
 import logging
@@ -26,19 +24,6 @@
     cast,
 )
 
-WaitForSingleObject: Optional[Callable[[int, int], int]]
-INFINITE: Optional[int]
-try:
-    # Try builtin Python 3 Windows API
-    from _winapi import INFINITE, WaitForSingleObject  # type: ignore
-
-    HAS_EVENTS = True
-except ImportError:
-    WaitForSingleObject, INFINITE = None, None
-    HAS_EVENTS = False
-
-# Import Modules
-# ==============
 from can import (
     BitTiming,
     BitTimingFd,
@@ -57,22 +42,29 @@
     time_perfcounter_correlation,
 )
 
-# Define Module Logger
-# ====================
-LOG = logging.getLogger(__name__)
-
-# Import Vector API modules
-# =========================
 from . import xlclass, xldefine
 from .exceptions import VectorError, VectorInitializationError, VectorOperationError
 
+LOG = logging.getLogger(__name__)
+
 # Import safely Vector API module for Travis tests
 xldriver: Optional[ModuleType] = None
 try:
     from . import xldriver
 except Exception as exc:
     LOG.warning("Could not import vxlapi: %s", exc)
 
+WaitForSingleObject: Optional[Callable[[int, int], int]]
+INFINITE: Optional[int]
+try:
+    # Try builtin Python 3 Windows API
+    from _winapi import INFINITE, WaitForSingleObject  # type: ignore
+
+    HAS_EVENTS = True
+except ImportError:
+    WaitForSingleObject, INFINITE = None, None
+    HAS_EVENTS = False
+
 
 class VectorBus(BusABC):
     """The CAN Bus implemented for the Vector interface."""

can/interfaces/vector/xldriver.py

@@ -5,22 +5,15 @@
 Authors: Julien Grave <[email protected]>, Christian Sandberg
 """
 
-# Import Standard Python Modules
-# ==============================
 import ctypes
 import logging
 import platform
 
+from . import xlclass
 from .exceptions import VectorInitializationError, VectorOperationError
 
-# Define Module Logger
-# ====================
 LOG = logging.getLogger(__name__)
 
-# Vector XL API Definitions
-# =========================
-from . import xlclass
-
 # Load Windows DLL
 DLL_NAME = "vxlapi64" if platform.architecture()[0] == "64bit" else "vxlapi"
 _xlapi_dll = ctypes.windll.LoadLibrary(DLL_NAME)

pyproject.toml

@@ -59,7 +59,7 @@ changelog = "https://github.com/hardbyte/python-can/blob/develop/CHANGELOG.md"
 [project.optional-dependencies]
 lint = [
     "pylint==2.17.*",
-    "ruff==0.0.267",
+    "ruff==0.0.269",
     "black==23.3.*",
     "mypy==1.3.*",
 ]
@@ -131,6 +131,11 @@ select = [
     "F401", # unused-imports
     "UP", # pyupgrade
     "I", # isort
+    "E", # pycodestyle errors
+    "W", # pycodestyle warnings
+]
+ignore = [
+    "E501", # Line too long
 ]
 
 [tool.ruff.isort]