fix more mypy and flake8 warnings

Author: attwad

pythonosc/dispatcher.py

@@ -32,7 +32,7 @@ def __init__(self, _callback: Callable, _args: Union[Any, List[Any]],
 
     # needed for test module
     def __eq__(self, other: Any) -> bool:
-        return (type(self) == type(other) and
+        return (isinstance(self, type(other)) and
                 self.callback == other.callback and
                 self.args == other.args and
                 self.needs_reply_address == other.needs_reply_address)
@@ -63,8 +63,8 @@ class Dispatcher(object):
     """
 
     def __init__(self) -> None:
-        self._map = collections.defaultdict(list)  # type: DefaultDict[str, List[Handler]]
-        self._default_handler = None  # type: Optional[Handler]
+        self._map: DefaultDict[str, List[Handler]] = collections.defaultdict(list)
+        self._default_handler: Optional[Handler] = None
 
     def map(self, address: str, handler: Callable, *args: Union[Any, List[Any]],
             needs_reply_address: bool = False) -> Handler:

pythonosc/osc_bundle_builder.py

@@ -25,7 +25,7 @@ def __init__(self, timestamp: int) -> None:
                        seconds since the epoch in UTC or IMMEDIATELY.
         """
         self._timestamp = timestamp
-        self._contents = []  # type: List[osc_bundle.OscBundle]
+        self._contents: List[osc_bundle.OscBundle] = []
 
     def add_content(self, content: osc_bundle.OscBundle) -> None:
         """Add a new content to this bundle.
@@ -45,8 +45,8 @@ def build(self) -> osc_bundle.OscBundle:
         try:
             dgram += osc_types.write_date(self._timestamp)
             for content in self._contents:
-                if (type(content) == osc_message.OscMessage
-                        or type(content) == osc_bundle.OscBundle):
+                if (isinstance(content, osc_message.OscMessage)
+                        or isinstance(content, osc_bundle.OscBundle)):
                     size = content.size
                     dgram += osc_types.write_int(size)
                     dgram += content.dgram

pythonosc/osc_packet.py

@@ -9,7 +9,7 @@
 from pythonosc import osc_bundle
 from pythonosc import osc_message
 
-from typing import Union, List, NamedTuple
+from typing import List, NamedTuple
 
 # A namedtuple as returned my the _timed_msg_of_bundle function.
 # 1) the system time at which the message should be executed

pythonosc/parsing/ntp.py

@@ -41,10 +41,10 @@ def parse_timestamp(timestamp: int) -> Timestamp:
 def ntp_to_system_time(timestamp: bytes) -> float:
     """Convert a NTP timestamp to system time in seconds."""
     try:
-        timestamp = struct.unpack('>Q', timestamp)[0]
+        ts = struct.unpack('>Q', timestamp)[0]
     except Exception as e:
         raise NtpError(e)
-    return timestamp * _NTP_TIMESTAMP_TO_SECONDS - _NTP_DELTA
+    return ts * _NTP_TIMESTAMP_TO_SECONDS - _NTP_DELTA
 
 
 def system_time_to_ntp(seconds: float) -> bytes:

pythonosc/test/test_osc_message.py

@@ -66,21 +66,21 @@ def test_switch_goes_off(self):
         msg = osc_message.OscMessage(_DGRAM_SWITCH_GOES_OFF)
         self.assertEqual("/SYNC", msg.address)
         self.assertEqual(1, len(msg.params))
-        self.assertTrue(type(msg.params[0]) == float)
+        self.assertTrue(isinstance(msg.params[0], float))
         self.assertAlmostEqual(0.0, msg.params[0])
 
     def test_switch_goes_on(self):
         msg = osc_message.OscMessage(_DGRAM_SWITCH_GOES_ON)
         self.assertEqual("/SYNC", msg.address)
         self.assertEqual(1, len(msg.params))
-        self.assertTrue(type(msg.params[0]) == float)
+        self.assertTrue(isinstance(msg.params[0], float))
         self.assertAlmostEqual(0.5, msg.params[0])
 
     def test_knob_rotates(self):
         msg = osc_message.OscMessage(_DGRAM_KNOB_ROTATES)
         self.assertEqual("/FB", msg.address)
         self.assertEqual(1, len(msg.params))
-        self.assertTrue(type(msg.params[0]) == float)
+        self.assertTrue(isinstance(msg.params[0], float))
 
     def test_no_params(self):
         msg = osc_message.OscMessage(_DGRAM_NO_PARAMS)
@@ -126,7 +126,7 @@ def test_ignores_unknown_param(self):
         msg = osc_message.OscMessage(_DGRAM_UNKNOWN_PARAM_TYPE)
         self.assertEqual("/SYNC", msg.address)
         self.assertEqual(1, len(msg.params))
-        self.assertTrue(type(msg.params[0]) == float)
+        self.assertTrue(isinstance(msg.params[0], float))
         self.assertAlmostEqual(0.5, msg.params[0])
 
     def test_raises_on_invalid_array(self):

pythonosc/udp_client.py

@@ -68,12 +68,11 @@ def send_message(self, address: str, value: ArgValue) -> None:
         """
         builder = OscMessageBuilder(address=address)
         if value is None:
-            values = []
+            pass
         elif not isinstance(value, Iterable) or isinstance(value, (str, bytes)):
-            values = [value]
+            builder.add_arg(value)
         else:
-            values = value
-        for val in values:
-            builder.add_arg(val)
+            for val in value:
+                builder.add_arg(val)
         msg = builder.build()
         self.send(msg)