fix other linter stuff

felixdivo · felixdivo · commit 4033a621ec2f · 2019-05-19T23:42:26.000+02:00
diff --git a/.pylintrc-wip b/.pylintrc-wip
@@ -64,41 +64,19 @@ disable=blacklisted-name,
         invalid-name,
         missing-docstring,
         empty-docstring,
-        singleton-comparison,
-        misplaced-comparison-constant,
-        consider-using-enumerate,
-        consider-iterating-dictionary,
-        bad-classmethod-argument,
-        bad-mcs-method-argument,
-        bad-mcs-classmethod-argument,
         single-string-used-for-slots,
         line-too-long,
         too-many-lines,
-        multiple-statements,
-        superfluous-parens,
         bad-whitespace,
         mixed-line-endings,
         unexpected-line-ending-format,
         bad-continuation,
-        wrong-spelling-in-comment,
-        wrong-spelling-in-docstring,
-        invalid-characters-in-docstring,
         multiple-imports,
         wrong-import-order,
         ungrouped-imports,
         wrong-import-position,
-        useless-import-alias,
-        len-as-condition,
-        syntax-error,
-        unrecognized-inline-option,
-        bad-option-value,
-        return-in-init,
-        duplicate-argument-name,
-        abstract-class-instantiated,
-        bad-reversed-sequence,
         too-many-star-expressions,
         invalid-star-assignment-target,
-        star-needs-assignment-target,
         method-hidden,
         access-member-before-definition,
         no-method-argument,
@@ -151,16 +129,7 @@ disable=blacklisted-name,
         yield-inside-async-function,
         locally-disabled,
         file-ignored,
-        suppressed-message,
-        useless-suppression,
-        deprecated-pragma,
-        use-symbolic-message-instead,
-        c-extension-no-member,
-        literal-comparison,
-        comparison-with-itself,
         no-self-use,
-        no-classmethod-decorator,
-        no-staticmethod-decorator,
         useless-object-inheritance,
         cyclic-import,
         duplicate-code,
@@ -173,18 +142,8 @@ disable=blacklisted-name,
         too-many-arguments,
         too-many-locals,
         too-many-statements,
-        too-many-boolean-expressions,
-        consider-merging-isinstance,
         too-many-nested-blocks,
-        simplifiable-if-statement,
-        redefined-argument-from-local,
-        no-else-return,
-        consider-using-ternary,
-        trailing-comma-tuple,
-        stop-iteration-return,
-        simplify-boolean-expression,
         inconsistent-return-statements,
-        useless-return,
         no-else-raise,
         dangerous-default-value,
         pointless-statement,
@@ -216,10 +175,6 @@ disable=blacklisted-name,
         misplaced-future,
         fixme,
         invalid-encoded-data,
-        global-variable-undefined,
-        global-variable-not-assigned,
-        global-statement,
-        global-at-module-level,
         unused-import,
         unused-variable,
         unused-argument,
@@ -233,18 +188,8 @@ disable=blacklisted-name,
         missing-format-argument-key,
         unused-format-string-argument,
         invalid-format-index,
-        duplicate-string-formatting-argument,
-        implicit-str-concat-in-sequence,
-        redundant-unittest-assert,
-        bad-thread-instantiation,
-        shallow-copy-environ,
-        invalid-envvar-default,
-        subprocess-popen-preexec-fn,
         no-absolute-import,
         dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
         indexing-exception,
         raising-string,
         oct-method,
@@ -253,16 +198,11 @@ disable=blacklisted-name,
         invalid-str-codec,
         sys-max-int,
         next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
-        redefined-builtin
+        redefined-builtin,
+        no-else-return,
+        redefined-argument-from-local,
+        abstract-class-instantiated,
+        multiple-statements
 
 # 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/ctypesutil.py b/can/ctypesutil.py
@@ -34,7 +34,7 @@ def map_symbol(self, func_name, restype=None, argtypes=(), errcheck=None):
         :param callable errcheck:
             optional error checking function, see ctypes docs for _FuncPtr
         """
-        if (argtypes):
+        if argtypes:
             prototype = self.function_type(restype, *argtypes)
         else:
             prototype = self.function_type(restype)
@@ -46,7 +46,7 @@ def map_symbol(self, func_name, restype=None, argtypes=(), errcheck=None):
         setattr(symbol, "_name", func_name)
         log.debug('Wrapped function "{}", result type: {}, error_check {}'.format(func_name, type(restype), errcheck))
 
-        if (errcheck):
+        if errcheck:
             symbol.errcheck = errcheck
 
         setattr(self, func_name, symbol)
@@ -57,7 +57,7 @@ class CLibrary_Win32(_LibBase, LibraryMixin):
     " Basic ctypes.WinDLL derived class + LibraryMixin "
 
     def __init__(self, library_or_path):
-        if (isinstance(library_or_path, str)):
+        if isinstance(library_or_path, str):
             super().__init__(library_or_path)
         else:
             super().__init__(library_or_path._name, library_or_path._handle)
@@ -71,7 +71,7 @@ class CLibrary_Unix(ctypes.CDLL, LibraryMixin):
     " Basic ctypes.CDLL derived class + LibraryMixin "
 
     def __init__(self, library_or_path):
-        if (isinstance(library_or_path, str)):
+        if isinstance(library_or_path, str):
             super().__init__(library_or_path)
         else:
             super().__init__(library_or_path._name, library_or_path._handle)
diff --git a/can/interfaces/ixxat/canlib.py b/can/interfaces/ixxat/canlib.py
@@ -296,7 +296,7 @@ def __init__(self, channel, can_filters=None, **kwargs):
         # Usually comes as a string from the config file
         channel = int(channel)
 
-        if (bitrate not in self.CHANNEL_BITRATES[0]):
+        if bitrate not in self.CHANNEL_BITRATES[0]:
             raise ValueError("Invalid bitrate {}".format(bitrate))
 
         self._device_handle = HANDLE()
@@ -317,7 +317,7 @@ def __init__(self, channel, can_filters=None, **kwargs):
             try:
                 _canlib.vciEnumDeviceNext(self._device_handle, ctypes.byref(self._device_info))
             except StopIteration:
-                if (UniqueHardwareId is None):
+                if UniqueHardwareId is None:
                     raise VCIDeviceNotFoundError("No IXXAT device(s) connected or device(s) in use by other process(es).")
                 else:
                     raise VCIDeviceNotFoundError("Unique HW ID {} not connected or not available.".format(UniqueHardwareId))
diff --git a/can/interfaces/kvaser/canlib.py b/can/interfaces/kvaser/canlib.py
@@ -113,7 +113,7 @@ class c_canHandle(ctypes.c_int):
 
 
 def __handle_is_valid(handle):
-    return (handle.value > canINVALID_HANDLE)
+    return handle.value > canINVALID_HANDLE
 
 
 def __check_bus_handle_validity(handle, function, arguments):
diff --git a/can/interfaces/pcan/basic.py b/can/interfaces/pcan/basic.py
@@ -361,7 +361,7 @@ def __init__(self):
             self.__m_dllBasic = cdll.LoadLibrary('libPCBUSB.dylib')
         else:
             self.__m_dllBasic = cdll.LoadLibrary("libpcanbasic.so")
-        if self.__m_dllBasic == None:
+        if self.__m_dllBasic is None:
             logger.error("Exception: The PCAN-Basic DLL couldn't be loaded!")
 
     def Initialize(
diff --git a/can/interfaces/usb2can/serial_selector.py b/can/interfaces/usb2can/serial_selector.py
@@ -13,12 +13,12 @@
 
 
 def WMIDateStringToDate(dtmDate):
-    if (dtmDate[4] == 0):
+    if dtmDate[4] == 0:
         strDateTime = dtmDate[5] + '/'
     else:
         strDateTime = dtmDate[4] + dtmDate[5] + '/'
 
-    if (dtmDate[6] == 0):
+    if dtmDate[6] == 0:
         strDateTime = strDateTime + dtmDate[7] + '/'
     else:
         strDateTime = strDateTime + dtmDate[6] + dtmDate[7] + '/'
diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
@@ -99,7 +99,7 @@ def __init__(self, channel, can_filters=None, poll_interval=0.01,
                 if channel_config.serialNumber == serial:
                     if channel_config.hwChannel in self.channels:
                         channel_index.append(channel_config.channelIndex)
-            if len(channel_index) > 0:
+            if channel_index:
                 if len(channel_index) != len(self.channels):
                     LOG.info("At least one defined channel wasn't found on the specified hardware.")
                 self.channels = channel_index
diff --git a/can/io/canutils.py b/can/io/canutils.py
@@ -55,10 +55,7 @@ def __iter__(self):
             if channel.isdigit():
                 channel = int(channel)
 
-            if len(canId) > 3:
-                isExtended = True
-            else:
-                isExtended = False
+            isExtended = len(canId) > 3
             canId = int(canId, 16)
 
             if data and data[0].lower() == 'r':
diff --git a/can/io/csv.py b/can/io/csv.py
@@ -89,7 +89,11 @@ def __init__(self, file):
 
     def __iter__(self):
         # skip the header line
-        next(self.file)
+        try:
+            next(self.file)
+        except StopIteration:
+            # don't crash on a file with only a header
+            return
 
         for line in self.file:
 
diff --git a/can/logger.py b/can/logger.py
@@ -75,7 +75,7 @@ def main():
     can.set_logging_level(logging_level_name)
 
     can_filters = []
-    if len(results.filter) > 0:
+    if results.filter:
         print(f"Adding filter(s): {results.filter}")
         for filt in results.filter:
             if ':' in filt:
diff --git a/can/message.py b/can/message.py
@@ -227,21 +227,21 @@ def _check(self):
             raise ValueError("arbitration IDs may not be negative")
 
         if self.is_extended_id:
-            if 0x20000000 <= self.arbitration_id:
+            if self.arbitration_id >= 0x20000000:
                 raise ValueError("Extended arbitration IDs must be less than 2^29")
-        elif 0x800 <= self.arbitration_id:
+        elif self.arbitration_id >= 0x800:
             raise ValueError("Normal arbitration IDs must be less than 2^11")
 
         if self.dlc < 0:
             raise ValueError("DLC may not be negative")
         if self.is_fd:
-            if 64 < self.dlc:
+            if self.dlc > 64:
                 raise ValueError("DLC was {} but it should be <= 64 for CAN FD frames".format(self.dlc))
-        elif 8 < self.dlc:
+        elif self.dlc > 8:
             raise ValueError("DLC was {} but it should be <= 8 for normal CAN frames".format(self.dlc))
 
         if self.is_remote_frame:
-            if self.data is not None and len(self.data) != 0:
+            if self.data is not None and not self.data:
                 raise ValueError("remote frames may not carry any data")
         elif self.dlc != len(self.data):
             raise ValueError("the DLC and the length of the data must match up for non remote frames")
diff --git a/can/viewer.py b/can/viewer.py
@@ -141,7 +141,7 @@ def run(self):
     # Unpack the data and then convert it into SI-units
     @staticmethod
     def unpack_data(cmd, cmd_to_struct, data):  # type: (int, Dict, bytes) -> List[Union[float, int]]
-        if not cmd_to_struct or len(data) == 0:
+        if not cmd_to_struct or data:
             # These messages do not contain a data package
             return []
 
@@ -403,15 +403,15 @@ def parse_args(args):
                           choices=sorted(can.VALID_INTERFACES))
 
     # Print help message when no arguments are given
-    if len(args) == 0:
+    if args:
         parser.print_help(sys.stderr)
         import errno
         raise SystemExit(errno.EINVAL)
 
     parsed_args = parser.parse_args(args)
 
     can_filters = []
-    if len(parsed_args.filter) > 0:
+    if parsed_args.filter:
         # print('Adding filter/s', parsed_args.filter)
         for flt in parsed_args.filter:
             # print(filter)
@@ -445,7 +445,7 @@ def parse_args(args):
     # In order to convert from raw integer value the real units are multiplied with the values and similarly the values
     # are divided by the value in order to convert from real units to raw integer values.
     data_structs = {}  # type: Dict[Union[int, Tuple[int, ...]], Union[struct.Struct, Tuple, None]]
-    if len(parsed_args.decode) > 0:
+    if parsed_args.decode:
         if os.path.isfile(parsed_args.decode[0]):
             with open(parsed_args.decode[0], 'r') as f:
                 structs = f.readlines()
