also enable mypy on the examples; this required two tiny changes somehwere else

felixdivo · felixdivo · commit 65f46cd703b5 · 2019-09-04T09:10:13.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -104,6 +104,8 @@ jobs:
           can/typechecking.py
           can/util.py
           can/io/**.py
+          scripts/**.py
+          examples/**.py
     - stage: linter
       name: "Formatting Checks"
       python: "3.7"
diff --git a/can/viewer.py b/can/viewer.py
@@ -43,7 +43,7 @@
     logger.warning(
         "You won't be able to use the viewer program without " "curses installed!"
     )
-    curses = None
+    curses = None  # type: ignore
 
 
 class CanViewer:
@@ -153,7 +153,7 @@ def unpack_data(
                 value = cmd_to_struct[key]
                 if isinstance(value, tuple):
                     # The struct is given as the fist argument
-                    struct_t = value[0]  # type: struct.Struct
+                    struct_t: struct.Struct = value[0]
 
                     # The conversion from raw values to SI-units are given in the rest of the tuple
                     values = [
@@ -162,8 +162,8 @@ def unpack_data(
                     ]
                 else:
                     # No conversion from SI-units is needed
-                    struct_t = value  # type: struct.Struct
-                    values = list(struct_t.unpack(data))
+                    as_struct_t: struct.Struct = value
+                    values = list(as_struct_t.unpack(data))
 
                 return values
         else:
diff --git a/examples/cyclic_multiple.py b/examples/cyclic_multiple.py
@@ -133,7 +133,7 @@ def cyclic_multiple_send_modify(bus):
     for interface, channel in [("socketcan", "vcan0")]:
         print(f"Carrying out cyclic multiple tests with {interface} interface")
 
-        with can.Bus(interface=interface, channel=channel, bitrate=500000) as BUS:
+        with can.Bus(interface=interface, channel=channel, bitrate=500000) as BUS:  # type: ignore
             cyclic_multiple_send(BUS)
             cyclic_multiple_send_modify(BUS)
 
diff --git a/examples/virtual_can_demo.py b/examples/virtual_can_demo.py
@@ -10,15 +10,16 @@
 import can
 
 
-def producer(thread_id, message_count=16):
+def producer(thread_id: int, message_count: int = 16):
     """Spam the bus with messages including the data id.
 
-    :param int id: the id of the thread/process
+    :param thread_id: the id of the thread/process
+    :param message_count: the number of messages that shall be send
     """
-    with can.Bus(bustype="socketcan", channel="vcan0") as bus:
+    with can.Bus(bustype="socketcan", channel="vcan0") as bus:  # type: ignore
         for i in range(message_count):
             msg = can.Message(
-                arbitration_id=0x0CF02200 + id, data=[thread_id, i, 0, 1, 3, 1, 4, 1]
+                arbitration_id=0x0CF02200 + thread_id, data=[thread_id, i, 0, 1, 3, 1, 4, 1]
             )
             bus.send(msg)
         sleep(1.0)
