python-osc 1.9.0__tar.gz → 1.9.1__tar.gz

{python_osc-1.9.0/python_osc.egg-info → python_osc-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-osc
-Version: 1.9.0
+Version: 1.9.1
 Summary: Open Sound Control server and client implementations in pure Python
 Author-email: attwad <tmusoft@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -60,10 +60,12 @@ and is currently in a stable state.
 Features
 ========
 
-* UDP blocking/threading/forking/asyncio server implementations
-* UDP client
+* UDP and TCP blocking/threading/forking/asyncio server implementations
+* UDP and TCP clients, including asyncio support
+* TCP support for 1.0 and 1.1 protocol formats
 * int, int64, float, string, double, MIDI, timestamps, blob, nil OSC arguments
 * simple OSC address<->callback matching system
+* support for sending responses from callback handlers in client and server
 * extensive unit test coverage
 * basic client and server examples
 
@@ -188,7 +190,8 @@ Building bundles
     # The bundle has 5 elements in total now.
 
     bundle = bundle.build()
-    # You can now send it via a client as described in other examples.
+    # You can now send it via a client with the `.send()` method:
+    client.send(bundle)
 
 License?
 ========

{python_osc-1.9.0 → python_osc-1.9.1}/README.rst

@@ -18,10 +18,12 @@ and is currently in a stable state.
 Features
 ========
 
-* UDP blocking/threading/forking/asyncio server implementations
-* UDP client
+* UDP and TCP blocking/threading/forking/asyncio server implementations
+* UDP and TCP clients, including asyncio support
+* TCP support for 1.0 and 1.1 protocol formats
 * int, int64, float, string, double, MIDI, timestamps, blob, nil OSC arguments
 * simple OSC address<->callback matching system
+* support for sending responses from callback handlers in client and server
 * extensive unit test coverage
 * basic client and server examples
 
@@ -146,7 +148,8 @@ Building bundles
     # The bundle has 5 elements in total now.
 
     bundle = bundle.build()
-    # You can now send it via a client as described in other examples.
+    # You can now send it via a client with the `.send()` method:
+    client.send(bundle)
 
 License?
 ========

python_osc-1.9.1/pyproject.toml

@@ -0,0 +1,58 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-osc"
+version = "1.9.1"
+description = "Open Sound Control server and client implementations in pure Python"
+readme = "README.rst"
+requires-python = ">=3.10"
+license = { file = "LICENSE.txt" }
+authors = [
+    { name = "attwad", email = "tmusoft@gmail.com" },
+]
+keywords = ["osc", "sound", "midi", "music"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: Freely Distributable",
+    "Programming Language :: Python :: 3",
+    "Topic :: Multimedia :: Sound/Audio",
+    "Topic :: System :: Networking",
+]
+
+[project.urls]
+Repository = "https://github.com/attwad/python-osc"
+
+[tool.mypy]
+# Would be great to turn this on, however there's too many cases it would break
+# right now.
+# disallow_any_generics = true
+
+disallow_subclassing_any = true
+
+# Allow functions _without_ type annotations, but require that annotations be
+# complete (possibly including the `Any` type) where they are present.
+disallow_incomplete_defs = true
+# check_untyped_defs = true
+disallow_untyped_decorators = true
+
+# # Would be great to turn these on eventually
+# no_implicit_optional = true
+# strict_optional = true
+
+warn_redundant_casts = true
+warn_unused_ignores = true
+show_error_codes = true
+# # Would be great to turn this on eventually
+# # warn_return_any = true
+# warn_unreachable = true
+
+# implicit_reexport = False
+# strict_equality = true
+
+scripts_are_modules = true
+warn_unused_configs = true
+
+enable_error_code = "ignore-without-code"

{python_osc-1.9.0 → python_osc-1.9.1/python_osc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-osc
-Version: 1.9.0
+Version: 1.9.1
 Summary: Open Sound Control server and client implementations in pure Python
 Author-email: attwad <tmusoft@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -60,10 +60,12 @@ and is currently in a stable state.
 Features
 ========
 
-* UDP blocking/threading/forking/asyncio server implementations
-* UDP client
+* UDP and TCP blocking/threading/forking/asyncio server implementations
+* UDP and TCP clients, including asyncio support
+* TCP support for 1.0 and 1.1 protocol formats
 * int, int64, float, string, double, MIDI, timestamps, blob, nil OSC arguments
 * simple OSC address<->callback matching system
+* support for sending responses from callback handlers in client and server
 * extensive unit test coverage
 * basic client and server examples
 
@@ -188,7 +190,8 @@ Building bundles
     # The bundle has 5 elements in total now.
 
     bundle = bundle.build()
-    # You can now send it via a client as described in other examples.
+    # You can now send it via a client with the `.send()` method:
+    client.send(bundle)
 
 License?
 ========

{python_osc-1.9.0 → python_osc-1.9.1}/python_osc.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE.txt
 MANIFEST.in
 README.rst
 pyproject.toml
-setup.cfg
 python_osc.egg-info/PKG-INFO
 python_osc.egg-info/SOURCES.txt
 python_osc.egg-info/dependency_links.txt

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/dispatcher.py

@@ -175,8 +175,7 @@ class Dispatcher(object):
         except ValueError as e:
             if str(e) == "list.remove(x): x not in list":
                 raise ValueError(
-                    "Address '%s' doesn't have handler '%s' mapped to it"
-                    % (address, handler)
+                    f"Address '{address}' doesn't have handler '{handler}' mapped to it"
                 ) from e
 
     def handlers_for_address(
@@ -202,7 +201,7 @@ class Dispatcher(object):
         pattern = pattern.replace("\\*", "[\\w|\\+]*")
         # The rest of the syntax in the specification is like the re module so
         # we're fine.
-        pattern = pattern + "$"
+        pattern = f"{pattern}$"
         patterncompiled = re.compile(pattern)
         matched = False
 

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/osc_bundle.py

@@ -33,7 +33,7 @@ class OscBundle(object):
         try:
             self._timestamp, index = osc_types.get_date(self._dgram, index)
         except osc_types.ParseError as pe:
-            raise ParseError("Could not get the date from the datagram: %s" % pe)
+            raise ParseError(f"Could not get the date from the datagram: {pe}")
         # Get the contents as a list of OscBundle and OscMessage.
         self._contents = self._parse_contents(index)
 
@@ -61,10 +61,10 @@ class OscBundle(object):
                     contents.append(osc_message.OscMessage(content_dgram))
                 else:
                     logging.warning(
-                        "Could not identify content type of dgram %r" % content_dgram
+                        f"Could not identify content type of dgram {content_dgram!r}"
                     )
         except (osc_types.ParseError, osc_message.ParseError, IndexError) as e:
-            raise ParseError("Could not parse a content datagram: %s" % e)
+            raise ParseError(f"Could not parse a content datagram: {e}")
 
         return contents
 

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/osc_bundle_builder.py

@@ -53,9 +53,8 @@ class OscBundleBuilder(object):
                     dgram += content.dgram
                 else:
                     raise BuildError(
-                        "Content must be either OscBundle or OscMessage"
-                        "found {}".format(type(content))
+                        f"Content must be either OscBundle or OscMessage, found {type(content)}"
                     )
             return osc_bundle.OscBundle(dgram)
         except osc_types.BuildError as be:
-            raise BuildError("Could not build the bundle {}".format(be))
+            raise BuildError(f"Could not build the bundle {be}")

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/osc_message.py

@@ -73,21 +73,17 @@ class OscMessage(object):
                 elif param == "]":  # Array stop.
                     if len(param_stack) < 2:
                         raise ParseError(
-                            "Unexpected closing bracket in type tag: {0}".format(
-                                type_tag
-                            )
+                            f"Unexpected closing bracket in type tag: {type_tag}"
                         )
                     param_stack.pop()
                 # TODO: Support more exotic types as described in the specification.
                 else:
-                    logging.warning("Unhandled parameter type: {0}".format(param))
+                    logging.warning(f"Unhandled parameter type: {param}")
                     continue
                 if param not in "[]":
                     param_stack[-1].append(val)
             if len(param_stack) != 1:
-                raise ParseError(
-                    "Missing closing bracket in type tag: {0}".format(type_tag)
-                )
+                raise ParseError(f"Missing closing bracket in type tag: {type_tag}")
             self._parameters = params
         except osc_types.ParseError as pe:
             raise ParseError("Found incorrect datagram, ignoring it", pe)

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/osc_message_builder.py

@@ -90,9 +90,7 @@ class OscMessageBuilder(object):
         """
         if arg_type and not self._valid_type(arg_type):
             raise ValueError(
-                "arg_type must be one of {}, or an array of valid types".format(
-                    self._SUPPORTED_ARG_TYPES
-                )
+                f"arg_type must be one of {self._SUPPORTED_ARG_TYPES}, or an array of valid types"
             )
         if not arg_type:
             arg_type = self._get_arg_type(arg_value)
@@ -161,7 +159,7 @@ class OscMessageBuilder(object):
 
             # Write the parameters.
             arg_types = "".join([arg[0] for arg in self._args])
-            dgram += osc_types.write_string("," + arg_types)
+            dgram += osc_types.write_string(f",{arg_types}")
             for arg_type, value in self._args:
                 if arg_type == self.ARG_TYPE_STRING:
                     dgram += osc_types.write_string(value)  # type: ignore[arg-type]
@@ -188,13 +186,11 @@ class OscMessageBuilder(object):
                 ):
                     continue
                 else:
-                    raise BuildError(
-                        "Incorrect parameter type found {}".format(arg_type)
-                    )
+                    raise BuildError(f"Incorrect parameter type found {arg_type}")
 
             return osc_message.OscMessage(dgram)
         except osc_types.BuildError as be:
-            raise BuildError("Could not build the message: {}".format(be))
+            raise BuildError(f"Could not build the message: {be}")
 
 
 def build_msg(address: str, value: ArgValue = "") -> osc_message.OscMessage:

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/osc_packet.py

@@ -76,7 +76,7 @@ class OscPacket(object):
                     "OscBundle."
                 )
         except (osc_bundle.ParseError, osc_message.ParseError) as pe:
-            raise ParseError("Could not parse packet %s" % pe)
+            raise ParseError(f"Could not parse packet {pe}")
 
     @property
     def messages(self) -> List[TimedMessage]:

{python_osc-1.9.0 → python_osc-1.9.1}/pythonosc/parsing/osc_types.py

@@ -43,7 +43,7 @@ def write_string(val: str) -> bytes:
     try:
         dgram = val.encode("utf-8")  # Default, but better be explicit.
     except (UnicodeEncodeError, AttributeError) as e:
-        raise BuildError("Incorrect string, could not encode {}".format(e))
+        raise BuildError(f"Incorrect string, could not encode {e}")
     diff = _STRING_DGRAM_PAD - (len(dgram) % _STRING_DGRAM_PAD)
     dgram += b"\x00" * diff
     return dgram
@@ -90,9 +90,9 @@ def get_string(dgram: bytes, start_index: int) -> Tuple[str, int]:
         data_str = dgram[start_index : start_index + offset]
         return data_str.replace(b"\x00", b"").decode("utf-8"), start_index + offset
     except IndexError as ie:
-        raise ParseError("Could not parse datagram %s" % ie)
+        raise ParseError(f"Could not parse datagram {ie}")
     except TypeError as te:
-        raise ParseError("Could not parse datagram %s" % te)
+        raise ParseError(f"Could not parse datagram {te}")
 
 
 def write_int(val: int) -> bytes:
@@ -104,7 +104,7 @@ def write_int(val: int) -> bytes:
     try:
         return struct.pack(">i", val)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_int(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -128,7 +128,7 @@ def get_int(dgram: bytes, start_index: int) -> Tuple[int, int]:
             start_index + _INT_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def write_int64(val: int) -> bytes:
@@ -140,7 +140,7 @@ def write_int64(val: int) -> bytes:
     try:
         return struct.pack(">q", val)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_int64(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -164,7 +164,7 @@ def get_int64(dgram: bytes, start_index: int) -> Tuple[int, int]:
             start_index + _INT64_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def get_uint64(dgram: bytes, start_index: int) -> Tuple[int, int]:
@@ -190,7 +190,7 @@ def get_uint64(dgram: bytes, start_index: int) -> Tuple[int, int]:
             start_index + _UINT64_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def get_timetag(dgram: bytes, start_index: int) -> Tuple[Tuple[datetime, int], int]:
@@ -223,7 +223,7 @@ def get_timetag(dgram: bytes, start_index: int) -> Tuple[Tuple[datetime, int], i
 
         return (utc, fraction), start_index + _TIMETAG_DGRAM_LEN
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def write_float(val: float) -> bytes:
@@ -235,7 +235,7 @@ def write_float(val: float) -> bytes:
     try:
         return struct.pack(">f", val)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_float(dgram: bytes, start_index: int) -> Tuple[float, int]:
@@ -262,7 +262,7 @@ def get_float(dgram: bytes, start_index: int) -> Tuple[float, int]:
             start_index + _FLOAT_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def write_double(val: float) -> bytes:
@@ -274,7 +274,7 @@ def write_double(val: float) -> bytes:
     try:
         return struct.pack(">d", val)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_double(dgram: bytes, start_index: int) -> Tuple[float, int]:
@@ -300,7 +300,7 @@ def get_double(dgram: bytes, start_index: int) -> Tuple[float, int]:
             start_index + _DOUBLE_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram {}".format(e))
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def get_blob(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
@@ -393,7 +393,7 @@ def write_rgba(val: bytes) -> bytes:
     try:
         return struct.pack(">I", val)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_rgba(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
@@ -417,7 +417,7 @@ def get_rgba(dgram: bytes, start_index: int) -> Tuple[bytes, int]:
             start_index + _INT_DGRAM_LEN,
         )
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")
 
 
 def write_midi(val: MidiPacket) -> bytes:
@@ -435,7 +435,7 @@ def write_midi(val: MidiPacket) -> bytes:
         value = sum((value & 0xFF) << 8 * (3 - pos) for pos, value in enumerate(val))
         return struct.pack(">I", value)
     except struct.error as e:
-        raise BuildError("Wrong argument value passed: {}".format(e))
+        raise BuildError(f"Wrong argument value passed: {e}")
 
 
 def get_midi(dgram: bytes, start_index: int) -> Tuple[MidiPacket, int]:
@@ -460,4 +460,4 @@ def get_midi(dgram: bytes, start_index: int) -> Tuple[MidiPacket, int]:
         )
         return (midi_msg, start_index + _INT_DGRAM_LEN)
     except (struct.error, TypeError) as e:
-        raise ParseError("Could not parse datagram %s" % e)
+        raise ParseError(f"Could not parse datagram {e}")

python_osc-1.9.1/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

python_osc-1.9.0/pyproject.toml

@@ -1,21 +0,0 @@
-[project]
-name = "python-osc"
-version="1.9.0"
-description="Open Sound Control server and client implementations in pure Python"
-readme="README.rst"
-requires-python=">=3.10"
-license = {file = "LICENSE.txt"}
-authors = [
-  {name = "attwad", email = "tmusoft@gmail.com"},
-]
-keywords = ["osc", "sound", "midi", "music"]
-classifiers=[
-    'Development Status :: 5 - Production/Stable',
-    'Intended Audience :: Developers',
-    'License :: Freely Distributable',
-    'Programming Language :: Python :: 3',
-    'Topic :: Multimedia :: Sound/Audio',
-    'Topic :: System :: Networking',
-]
-[project.urls]
-Repository = "https://github.com/attwad/python-osc"

python_osc-1.9.0/setup.cfg

@@ -1,18 +0,0 @@
-[metadata]
-license_files = LICENSE.txt
-
-[mypy]
-disallow_subclassing_any = True
-disallow_incomplete_defs = True
-disallow_untyped_decorators = True
-warn_redundant_casts = True
-warn_unused_ignores = True
-show_error_codes = True
-scripts_are_modules = True
-warn_unused_configs = True
-enable_error_code = ignore-without-code
-
-[egg_info]
-tag_build = 
-tag_date = 0
-