run 2to3 and cleanup afterwards

Author: felixdivo

can/bus.py

@@ -24,7 +24,7 @@ class BusState(Enum):
     ERROR = auto()
 
 
-class BusABC(object):
+class BusABC(metaclass=ABCMeta):
     """The CAN Bus Abstract Base Class that serves as the basis
     for all concrete interfaces.
 
@@ -401,5 +401,3 @@ def _detect_available_configs():
                  for usage in the interface's bus constructor.
         """
         raise NotImplementedError()
-
-    __metaclass__ = ABCMeta

can/interface.py

@@ -144,10 +144,9 @@ def detect_available_configs(interfaces=None):
 
     # Figure out where to search
     if interfaces is None:
-        # use an iterator over the keys so we do not have to copy it
-        interfaces = BACKENDS.keys()
+        interfaces = BACKENDS
     elif isinstance(interfaces, str):
-        interfaces = [interfaces, ]
+        interfaces = (interfaces, )
     # else it is supposed to be an iterable of strings
 
     result = []

can/interfaces/socketcan/socketcan.py

@@ -659,7 +659,7 @@ def receiver(event):
         bind_socket(receiver_socket, 'vcan0')
         print("Receiver is waiting for a message...")
         event.set()
-        print("Receiver got: ", capture_message(receiver_socket))
+        print(f"Receiver got: {capture_message(receiver_socket)}")
 
     def sender(event):
         event.wait()

can/interfaces/socketcan/utils.py

@@ -67,6 +67,7 @@ def find_available_interfaces():
         log.debug("find_available_interfaces(): detected: %s", interface_names)
         return filter(_PATTERN_CAN_INTERFACE.match, interface_names)
 
+
 def error_code_to_str(code):
     """
     Converts a given error code (errno) to a useful and human readable string.

can/io/generic.py

@@ -9,7 +9,7 @@
 from can import Listener
 
 
-class BaseIOHandler:
+class BaseIOHandler(metaclass=ABCMeta):
     """A generic file handler that can be used for reading and writing.
 
     Can be used as a context manager.
@@ -19,8 +19,6 @@ class BaseIOHandler:
         was opened
     """
 
-    __metaclass__ = ABCMeta
-
     def __init__(self, file, mode='rt'):
         """
         :param file: a path-like object to open a file, a file-like object

can/listener.py

@@ -16,7 +16,7 @@
 import asyncio
 
 
-class Listener:
+class Listener(metaclass=ABCMeta):
     """The basic listener that can be called directly to handle some
     CAN message::
 
@@ -32,8 +32,6 @@ class Listener:
         listener.stop()
     """
 
-    __metaclass__ = ABCMeta
-
     @abstractmethod
     def on_message_received(self, msg):
         """This method is called to handle the given message.

can/logger.py

@@ -76,7 +76,7 @@ def main():
 
     can_filters = []
     if len(results.filter) > 0:
-        print('Adding filter/s', results.filter)
+        print(f"Adding filter(s): {results.filter}")
         for filt in results.filter:
             if ':' in filt:
                 _ = filt.split(":")
@@ -99,8 +99,8 @@ def main():
     elif results.passive:
         bus.state = BusState.PASSIVE
 
-    print('Connected to {}: {}'.format(bus.__class__.__name__, bus.channel_info))
-    print('Can Logger (Started on {})\n'.format(datetime.now()))
+    print(f"Connected to {bus.__class__.__name__}: {bus.channel_info}")
+    print(f"Can Logger (Started on {datetime.now()})")
     logger = Logger(results.log_file)
 
     try:

can/player.py

@@ -78,7 +78,7 @@ def main():
     in_sync = MessageSync(reader, timestamps=results.timestamps,
                           gap=results.gap, skip=results.skip)
 
-    print('Can LogReader (Started on {})'.format(datetime.now()))
+    print(f"Can LogReader (Started on {datetime.now()})")
 
     try:
         for m in in_sync:

can/viewer.py

@@ -145,7 +145,7 @@ def unpack_data(cmd, cmd_to_struct, data):  # type: (int, Dict, bytes) -> List[U
             # These messages do not contain a data package
             return []
 
-        for key in cmd_to_struct.keys():
+        for key in cmd_to_struct:
             if cmd == key if isinstance(key, int) else cmd in key:
                 value = cmd_to_struct[key]
                 if isinstance(value, tuple):
@@ -265,7 +265,7 @@ def draw_header(self):
     def redraw_screen(self):
         # Trigger a complete redraw
         self.draw_header()
-        for key in self.ids.keys():
+        for key in self.ids:
             self.draw_can_bus_message(self.ids[key]['msg'])