Merge pull request #161 from PeterJCLaw/update-mypy

Updates for recent mypy

Author: attwad

pythonosc/osc_message_builder.py

@@ -35,7 +35,7 @@ class OscMessageBuilder(object):
         ARG_TYPE_FLOAT, ARG_TYPE_DOUBLE, ARG_TYPE_INT, ARG_TYPE_INT64, ARG_TYPE_BLOB, ARG_TYPE_STRING,
         ARG_TYPE_RGBA, ARG_TYPE_MIDI, ARG_TYPE_TRUE, ARG_TYPE_FALSE, ARG_TYPE_NIL)
 
-    def __init__(self, address: str=None) -> None:
+    def __init__(self, address: Optional[str] = None) -> None:
         """Initialize a new builder for a message.
 
         Args:
@@ -69,7 +69,7 @@ def _valid_type(self, arg_type: str) -> bool:
             return True
         return False
 
-    def add_arg(self, arg_value: ArgValue, arg_type: str=None) -> None:
+    def add_arg(self, arg_value: ArgValue, arg_type: Optional[str] = None) -> None:
         """Add a typed argument to this message.
 
         Args:

pythonosc/osc_server.py

@@ -57,7 +57,7 @@ def __init__(self, server_address: Tuple[str, int], dispatcher: Dispatcher, bind
             dispatcher: Dispatcher this server will use
             (optional) bind_and_activate: default=True defines if the server has to start on call of constructor  
         """
-        super().__init__(server_address, _UDPHandler, bind_and_activate)  # type: ignore[call-arg]  # https://github.com/python/typeshed/pull/8542
+        super().__init__(server_address, _UDPHandler, bind_and_activate)
         self._dispatcher = dispatcher
 
     def verify_request(self, request: _RequestType, client_address: _AddressType) -> bool:

pythonosc/udp_client.py

@@ -1,8 +1,10 @@
 """UDP Clients for sending OSC messages to an OSC server"""
 
-try:
+import sys
+
+if sys.version_info > (3, 5):
     from collections.abc import Iterable
-except ImportError: # python 3.5
+else:
     from collections import Iterable
 
 import socket