fix other linter stuff

felixdivo · felixdivo · commit 8a0d980304d3 · 2019-05-20T00:26:50.000+02:00
diff --git a/.pylintrc-wip b/.pylintrc-wip
@@ -93,22 +93,16 @@ disable=blacklisted-name,
         too-many-statements,
         too-many-nested-blocks,
         no-else-raise,
-        attribute-defined-outside-init,
-        protected-access,
-        abstract-method,
         bad-indentation,
         wildcard-import,
         fixme,
         broad-except,
         bad-format-string,
-        missing-format-argument-key,
         unused-format-string-argument,
-        invalid-format-index,
         no-absolute-import,
         dict-iter-method,
         oct-method,
         hex-method,
-        exception-message-attribute,
         redefined-builtin,
         no-else-return,
         redefined-argument-from-local,
@@ -118,7 +112,14 @@ disable=blacklisted-name,
         useless-else-on-loop,
         duplicate-code,
         inconsistent-return-statements,
-        arguments-differ
+        arguments-differ,
+        unused-wildcard-import,
+        logging-fstring-interpolation,
+        logging-format-interpolation,
+        unused-argument,
+        abstract-method,
+        attribute-defined-outside-init,
+        protected-access
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
diff --git a/can/broadcastmanager.py b/can/broadcastmanager.py
@@ -11,7 +11,6 @@
 import logging
 import threading
 import time
-import warnings
 
 log = logging.getLogger('can.bcm')
 
diff --git a/can/bus.py b/can/bus.py
@@ -8,7 +8,6 @@
 import logging
 import threading
 from time import time
-from collections import namedtuple
 from aenum import Enum, auto
 
 from .broadcastmanager import ThreadBasedCyclicSendTask
@@ -239,8 +238,8 @@ def _send_periodic_internal(self, msg, period, duration=None):
         :rtype: can.broadcastmanager.CyclicSendTaskABC
         """
         if not hasattr(self, "_lock_send_periodic"):
-            # Create a send lock for this bus
-            self._lock_send_periodic = threading.Lock()
+            # Create a send lock for this bus, but not for buses which override this method
+            self._lock_send_periodic = threading.Lock()  # pylint: disable=attribute-defined-outside-init
         task = ThreadBasedCyclicSendTask(self, self._lock_send_periodic, msg, period, duration)
         return task
 
diff --git a/can/ctypesutil.py b/can/ctypesutil.py
@@ -4,7 +4,6 @@
 This module contains common `ctypes` utils.
 """
 
-import binascii
 import ctypes
 import logging
 import sys
@@ -44,7 +43,7 @@ def map_symbol(self, func_name, restype=None, argtypes=(), errcheck=None):
             raise ImportError("Could not map function '{}' from library {}".format(func_name, self._name))
 
         setattr(symbol, "_name", func_name)
-        log.debug('Wrapped function "{}", result type: {}, error_check {}'.format(func_name, type(restype), errcheck))
+        log.debug(f'Wrapped function "{func_name}", result type: {type(restype)}, error_check {errcheck}')
 
         if errcheck:
             symbol.errcheck = errcheck
diff --git a/can/interface.py b/can/interface.py
@@ -6,13 +6,10 @@
 CyclicSendTasks.
 """
 
-import sys
 import importlib
 import logging
 
-import can
 from .bus import BusABC
-from .broadcastmanager import CyclicSendTaskABC, MultiRateCyclicSendTaskABC
 from .util import load_config
 from .interfaces import BACKENDS
 
@@ -56,7 +53,7 @@ def _get_class_for_interface(interface):
     return bus_class
 
 
-class Bus(BusABC):
+class Bus(BusABC): # pylint disable=abstract-method
     """Bus wrapper with configuration loading.
 
     Instantiates a CAN Bus of the given ``interface``, falls back to reading a
@@ -154,7 +151,7 @@ def detect_available_configs(interfaces=None):
 
         # get available channels
         try:
-            available = list(bus_class._detect_available_configs())
+            available = list(bus_class._detect_available_configs()) # pylint: disable=protected-access
         except NotImplementedError:
             log_autodetect.debug('interface "%s" does not support detection of available configurations', interface)
         else:
diff --git a/can/interfaces/ics_neovi/neovi_bus.py b/can/interfaces/ics_neovi/neovi_bus.py
@@ -234,7 +234,7 @@ def _process_msg_queue(self, timeout=0.1):
                 continue
             self.rx_buffer.append(ics_msg)
         if errors:
-            logger.warning("%d error(s) found" % errors)
+            logger.warning("%d error(s) found", errors)
 
             for msg in ics.get_error_messages(self.dev):
                 error = ICSApiError(*msg)
diff --git a/can/interfaces/ixxat/canlib.py b/can/interfaces/ixxat/canlib.py
@@ -18,7 +18,7 @@
 import logging
 import sys
 
-from can import CanError, BusABC, Message
+from can import BusABC, Message
 from can.broadcastmanager import (LimitedDurationCyclicSendTaskABC,
                                   RestartableCyclicTaskABC)
 from can.ctypesutil import CLibrary, HANDLE, PHANDLE, HRESULT as ctypes_HRESULT
@@ -383,7 +383,7 @@ def __init__(self, channel, can_filters=None, **kwargs):
 
         # Usually you get back 3 messages like "CAN initialized" ecc...
         # Clear the FIFO by filter them out with low timeout
-        for i in range(rxFifoSize):
+        for _ in range(rxFifoSize):
             try:
                 _canlib.canChannelReadMessage(self._channel_handle, 0, ctypes.byref(self._message))
             except (VCITimeout, VCIRxQueueEmptyError):
diff --git a/can/interfaces/kvaser/canlib.py b/can/interfaces/kvaser/canlib.py
@@ -375,10 +375,9 @@ def __init__(self, channel, can_filters=None, **kwargs):
         self.single_handle = single_handle
 
         num_channels = ctypes.c_int(0)
-        res = canGetNumberOfChannels(ctypes.byref(num_channels))
-        #log.debug("Res: {}".format(res))
+        #log.debug("Res: %d", canGetNumberOfChannels(ctypes.byref(num_channels)))
         num_channels = int(num_channels.value)
-        log.info('Found %d available channels' % num_channels)
+        log.info('Found %d available channels', num_channels)
         for idx in range(num_channels):
             channel_info = get_channel_info(idx)
             log.info('%d: %s', idx, channel_info)
@@ -391,7 +390,7 @@ def __init__(self, channel, can_filters=None, **kwargs):
         if fd:
             flags |= canstat.canOPEN_CAN_FD
 
-        log.debug('Creating read handle to bus channel: %s' % channel)
+        log.debug('Creating read handle to bus channel: %s', channel)
         self._read_handle = canOpenChannel(channel, flags)
         canIoCtl(self._read_handle,
                  canstat.canIOCTL_SET_TIMER_SCALE,
@@ -427,7 +426,7 @@ def __init__(self, channel, can_filters=None, **kwargs):
             log.debug("We don't require separate handles to the bus")
             self._write_handle = self._read_handle
         else:
-            log.debug('Creating separate handle for TX on channel: %s' % channel)
+            log.debug('Creating separate handle for TX on channel: %s', channel)
             self._write_handle = canOpenChannel(channel, flags)
             canBusOn(self._read_handle)
 
diff --git a/can/interfaces/pcan/pcan.py b/can/interfaces/pcan/pcan.py
@@ -5,10 +5,8 @@
 """
 
 import logging
-import sys
 import time
 
-import can
 from can import CanError, Message, BusABC
 from can.bus import BusState
 from can.util import len2dlc, dlc2len
@@ -165,7 +163,7 @@ def __init__(self, *args, channel='PCAN_USBBUS1', state=BusState.ACTIVE, bitrate
         self.m_PcanHandle = globals()[channel]
 
         if state is BusState.ACTIVE or state is BusState.PASSIVE:
-            self.state = state
+            self._state = state
         else:
             raise ArgumentError("BusState must be Active or Passive")
 
diff --git a/can/interfaces/socketcan/socketcan.py b/can/interfaces/socketcan/socketcan.py
@@ -3,7 +3,6 @@
 import logging
 import ctypes
 import ctypes.util
-import os
 import select
 import socket
 import struct
@@ -25,8 +24,7 @@
 from can.broadcastmanager import ModifiableCyclicTaskABC, \
     RestartableCyclicTaskABC, LimitedDurationCyclicSendTaskABC
 from can.interfaces.socketcan.constants import * # CAN_RAW, CAN_*_FLAG
-from can.interfaces.socketcan.utils import \
-    pack_filters, find_available_interfaces, error_code_to_str
+from can.interfaces.socketcan.utils import pack_filters, find_available_interfaces
 
 
 # Setup BCM struct
@@ -478,6 +476,7 @@ def __init__(self, channel="", receive_own_messages=False, fd=False, **kwargs):
         self.channel = channel
         self.channel_info = "socketcan channel '%s'" % channel
         self._bcm_sockets = {}
+        self._is_filtered = False
 
         # set the receive_own_messages parameter
         try:
diff --git a/can/interfaces/socketcan/utils.py b/can/interfaces/socketcan/utils.py
@@ -8,7 +8,6 @@
 import os
 import errno
 import struct
-import sys
 import subprocess
 import re
 
diff --git a/can/interfaces/systec/ucan.py b/can/interfaces/systec/ucan.py
@@ -947,7 +947,7 @@ def _connect_control(self, event, param, arg):
         - CbEvent.EVENT_FATALDISCON: USB-CAN-Handle of the disconnected module
         :param arg: Additional parameter defined with :meth:`init_hardware_ex` (not used in this wrapper class).
         """
-        log.debug("Event: %s, Param: %s" % (event, param))
+        log.debug("Event: %s, Param: %s", event, param)
 
         if event == CbEvent.EVENT_FATALDISCON:
             self.fatal_disconnect_event(param)
@@ -966,7 +966,7 @@ def _callback(self, handle, event, channel, arg):
             CAN channel (:data:`Channel.CHANNEL_CH0`, :data:`Channel.CHANNEL_CH1` or :data:`Channel.CHANNEL_ANY`).
         :param arg: Additional parameter defined with :meth:`init_hardware_ex`.
         """
-        log.debug("Handle: %s, Event: %s, Channel: %s" % (handle, event, channel))
+        log.debug("Handle: %s, Event: %s, Channel: %s", handle, event, channel)
 
         if event == CbEvent.EVENT_INITHW:
             self.init_hw_event()
diff --git a/can/interfaces/systec/ucanbus.py b/can/interfaces/systec/ucanbus.py
@@ -132,6 +132,8 @@ def __init__(self, channel, can_filters=None, **kwargs):
             self.channel,
             self._ucan.get_baudrate_message(self.BITRATES[bitrate])
         )
+        self._is_filtered = False
+
         super().__init__(channel=channel, can_filters=can_filters, **kwargs)
 
     def _recv_internal(self, timeout):
@@ -180,7 +182,8 @@ def send(self, msg, timeout=None):
     def _detect_available_configs():
         configs = []
         try:
-            for index, is_used, hw_info_ex, init_info in Ucan.enumerate_hardware():
+            # index, is_used, hw_info_ex, init_info
+            for _, _, hw_info_ex, _ in Ucan.enumerate_hardware():
                 configs.append({'interface': 'systec',
                                 'channel': Channel.CHANNEL_CH0,
                                 'device_number': hw_info_ex.device_number})
diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
@@ -10,7 +10,6 @@
 # ==============================
 import ctypes
 import logging
-import sys
 import time
 
 try:
@@ -28,7 +27,7 @@
 
 # Import Modules
 # ==============
-from can import BusABC, Message, CanError
+from can import BusABC, Message
 from can.util import len2dlc, dlc2len
 from .exceptions import VectorError
 
diff --git a/can/io/canutils.py b/can/io/canutils.py
@@ -6,8 +6,6 @@
 (https://github.com/linux-can/can-utils).
 """
 
-import time
-import datetime
 import logging
 
 from can.message import Message
diff --git a/can/io/generic.py b/can/io/generic.py
@@ -4,9 +4,7 @@
 Contains a generic class for file IO.
 """
 
-from abc import ABCMeta, abstractmethod
-
-from can import Listener
+from abc import ABCMeta
 
 
 class BaseIOHandler(metaclass=ABCMeta):
diff --git a/can/io/logger.py b/can/io/logger.py
@@ -18,7 +18,7 @@
 log = logging.getLogger("can.io.logger")
 
 
-class Logger(BaseIOHandler, Listener):
+class Logger(BaseIOHandler, Listener): # pylint: disable=abstract-method
     """
     Logs CAN messages to a file.
 
diff --git a/can/io/sqlite.py b/can/io/sqlite.py
@@ -6,7 +6,6 @@
 .. note:: The database schema is given in the documentation of the loggers.
 """
 
-import sys
 import time
 import threading
 import logging
@@ -143,10 +142,12 @@ def __init__(self, file, table_name="messages"):
         self.table_name = table_name
         self._db_filename = file
         self._stop_running_event = threading.Event()
+        self._conn = None
         self._writer_thread = threading.Thread(target=self._db_writer_thread)
         self._writer_thread.start()
         self.num_frames = 0
         self.last_write = time.time()
+        self._insert_template = f"INSERT INTO {self.table_name} VALUES (?, ?, ?, ?, ?, ?, ?)"
 
     def _create_db(self):
         """Creates a new databae or opens a connection to an existing one.
@@ -173,8 +174,6 @@ def _create_db(self):
         """.format(self.table_name))
         self._conn.commit()
 
-        self._insert_template = "INSERT INTO {} VALUES (?, ?, ?, ?, ?, ?, ?)".format(self.table_name)
-
     def _db_writer_thread(self):
         self._create_db()
 
@@ -198,7 +197,7 @@ def _db_writer_thread(self):
 
                     if time.time() - self.last_write > self.MAX_TIME_BETWEEN_WRITES or \
                        len(messages) > self.MAX_BUFFER_SIZE_BEFORE_WRITES:
-                       break
+                        break
                     else:
                         # just go on
                         msg = self.get_message(self.GET_MESSAGE_TIMEOUT)
diff --git a/can/message.py b/can/message.py
@@ -9,7 +9,6 @@
 """
 
 
-import warnings
 from copy import deepcopy
 from math import isinf, isnan
 
diff --git a/can/thread_safe_bus.py b/can/thread_safe_bus.py
@@ -33,7 +33,7 @@ def __exit__(self, *args):
             pass
 
 
-class ThreadSafeBus(ObjectProxy):
+class ThreadSafeBus(ObjectProxy): # pylint: disable=abstract-method
     """
     Contains a thread safe :class:`can.BusABC` implementation that
     wraps around an existing interface instance. All public methods
@@ -58,7 +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
-        self.__wrapped__._lock_send_periodic = nullcontext()
+        self.__wrapped__._lock_send_periodic = nullcontext() # pylint: disable=protected-access
 
         # init locks for sending and receiving separately
         self._lock_send = RLock()
diff --git a/can/util.py b/can/util.py
@@ -6,11 +6,9 @@
 
 import os
 import os.path
-import sys
 import platform
 import re
 import logging
-import warnings
 from configparser import ConfigParser
 
 import can
