fix other linter stuff

Author: felixdivo

.pylintrc-wip

@@ -205,16 +205,7 @@ disable=blacklisted-name,
         simplify-boolean-expression,
         inconsistent-return-statements,
         useless-return,
-        consider-swap-variables,
-        consider-using-join,
-        consider-using-in,
-        consider-using-get,
-        chained-comparison,
-        consider-using-dict-comprehension,
-        consider-using-set-comprehension,
-        simplifiable-if-expression,
         no-else-raise,
-        unreachable,
         dangerous-default-value,
         pointless-statement,
         pointless-string-statement,
@@ -253,11 +244,6 @@ disable=blacklisted-name,
         unused-variable,
         unused-argument,
         unused-wildcard-import,
-        redefined-outer-name,
-        redefined-builtin,
-        redefine-in-handler,
-        undefined-loop-variable,
-        unbalanced-tuple-unpacking,
         possibly-unused-variable,
         broad-except,
         logging-not-lazy,
@@ -275,39 +261,17 @@ disable=blacklisted-name,
         invalid-envvar-default,
         subprocess-popen-preexec-fn,
         no-absolute-import,
-        old-division,
         dict-iter-method,
         dict-view-method,
         next-method-called,
         metaclass-assignment,
         indexing-exception,
         raising-string,
-        reload-builtin,
         oct-method,
         hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
         exception-message-attribute,
         invalid-str-codec,
         sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
         next-method-defined,
         dict-items-not-iterating,
         dict-keys-not-iterating,
@@ -317,7 +281,8 @@ disable=blacklisted-name,
         xreadlines-attribute,
         deprecated-sys-function,
         exception-escape,
-        comprehension-escape
+        comprehension-escape,
+        redefined-builtin
 
 # 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

can/interfaces/ixxat/canlib.py

@@ -465,8 +465,8 @@ def _recv_internal(self, timeout):
         # so expect to see the value restarting from 0
         rx_msg = Message(
             timestamp=self._message.dwTime / self._tick_resolution,  # Relative time in s
-            is_remote_frame=True if self._message.uMsgInfo.Bits.rtr else False,
-            is_extended_id=True if self._message.uMsgInfo.Bits.ext else False,
+            is_remote_frame=bool(self._message.uMsgInfo.Bits.rtr),
+            is_extended_id=bool(self._message.uMsgInfo.Bits.ext),
             arbitration_id=self._message.dwMsgId,
             dlc=self._message.uMsgInfo.Bits.dlc,
             data=self._message.abData[:self._message.uMsgInfo.Bits.dlc],

can/interfaces/pcan/basic.py

@@ -658,13 +658,15 @@ def GetValue(
           A touple with 2 values
         """
         try:
-            if Parameter == PCAN_API_VERSION or Parameter == PCAN_HARDWARE_NAME or Parameter == PCAN_CHANNEL_VERSION or Parameter == PCAN_LOG_LOCATION or Parameter == PCAN_TRACE_LOCATION or Parameter == PCAN_BITRATE_INFO_FD or Parameter == PCAN_IP_ADDRESS:
+            if Parameter in (PCAN_API_VERSION, PCAN_HARDWARE_NAME, PCAN_CHANNEL_VERSION,
+                             PCAN_LOG_LOCATION, PCAN_TRACE_LOCATION, PCAN_BITRATE_INFO_FD,
+                             PCAN_IP_ADDRESS):
                 mybuffer = create_string_buffer(256)
             else:
                 mybuffer = c_int(0)
 
-            res = self.__m_dllBasic.CAN_GetValue(Channel,Parameter,byref(mybuffer),sizeof(mybuffer))
-            return TPCANStatus(res),mybuffer.value
+            res = self.__m_dllBasic.CAN_GetValue(Channel, Parameter, byref(mybuffer), sizeof(mybuffer))
+            return TPCANStatus(res), mybuffer.value
         except:
             logger.error("Exception on PCANBasic.GetValue")
             raise
@@ -694,13 +696,13 @@ def SetValue(
           A TPCANStatus error code
         """
         try:
-            if Parameter == PCAN_LOG_LOCATION or Parameter == PCAN_LOG_TEXT or Parameter == PCAN_TRACE_LOCATION:
+            if Parameter in (PCAN_LOG_LOCATION, PCAN_LOG_TEXT, PCAN_TRACE_LOCATION):
                 mybuffer = create_string_buffer(256)
             else:
                 mybuffer = c_int(0)
 
             mybuffer.value = Buffer
-            res = self.__m_dllBasic.CAN_SetValue(Channel,Parameter,byref(mybuffer),sizeof(mybuffer))
+            res = self.__m_dllBasic.CAN_SetValue(Channel, Parameter, byref(mybuffer), sizeof(mybuffer))
             return TPCANStatus(res)
         except:
             logger.error("Exception on PCANBasic.SetValue")

can/interfaces/usb2can/usb2canInterface.py

@@ -89,10 +89,7 @@ def __init__(self, *args, channel=None, dll="usb2can.dll", flags=0x00000008,
         self.can = Usb2CanAbstractionLayer(dll)
 
         # get the serial number of the device
-        if "serial" in kwargs:
-            device_id = kwargs["serial"]
-        else:
-            device_id = channel
+        device_id = kwargs.get("serial", d=channel)
 
         # search for a serial number if the device_id is None or empty
         if not device_id:
@@ -107,9 +104,9 @@ def __init__(self, *args, channel=None, dll="usb2can.dll", flags=0x00000008,
         self.channel_info = "USB2CAN device {}".format(device_id)
 
         connector = "{}; {}".format(device_id, baudrate)
-        self.handle = self.can.open(connector, flags)
+        self.handle = self.can.open(connector, flags_t)
 
-        super().__init__(channel=channel, dll=dll, flags=flags, bitrate=bitrate,
+        super().__init__(channel=channel, dll=dll, flags_t=flags_t, bitrate=bitrate,
                          *args, **kwargs)
 
     def send(self, msg, timeout=None):
@@ -137,7 +134,7 @@ def _recv_internal(self, timeout):
 
         if status == CANAL_ERROR_SUCCESS:
             rx = message_convert_rx(messagerx)
-        elif status == CANAL_ERROR_RCV_EMPTY or status == CANAL_ERROR_TIMEOUT:
+        elif status in (CANAL_ERROR_RCV_EMPTY, CANAL_ERROR_TIMEOUT):
             rx = None
         else:
             log.error('Canal Error %s', status)

can/interfaces/usb2can/usb2canabstractionlayer.py

@@ -14,10 +14,10 @@
 log = logging.getLogger('can.usb2can')
 
 # type definitions
-flags = c_ulong
+flags_t = c_ulong
 pConfigureStr = c_char_p
-handle = c_long
-timeout = c_ulong
+handle_t = c_long
+timeout_t = c_ulong
 filter_t = c_ulong
 
 # flags mappings
@@ -146,17 +146,17 @@ def blocking_receive(self, handle, msg, timeout):
             log.warning('Blocking Receive Failed')
             raise
 
-    def get_status(self, handle, CanalStatus):
+    def get_status(self, handle, status):
         try:
-            res = self.__m_dllBasic.CanalGetStatus(handle, CanalStatus)
+            res = self.__m_dllBasic.CanalGetStatus(handle, status)
             return res
         except:
             log.warning('Get status failed')
             raise
 
-    def get_statistics(self, handle, CanalStatistics):
+    def get_statistics(self, handle, statistics):
         try:
-            res = self.__m_dllBasic.CanalGetStatistics(handle, CanalStatistics)
+            res = self.__m_dllBasic.CanalGetStatistics(handle, statistics)
             return res
         except:
             log.warning('Get Statistics failed')