python-osc 1.9.2__tar.gz → 1.10.0__tar.gz

{python_osc-1.9.2/python_osc.egg-info → python_osc-1.10.0}/PKG-INFO

@@ -1,35 +1,34 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: python-osc
-Version: 1.9.2
+Version: 1.10.0
 Summary: Open Sound Control server and client implementations in pure Python
+Keywords: osc,sound,midi,music
+Author: attwad
 Author-email: attwad <tmusoft@gmail.com>
 License: This is free and unencumbered software released into the public domain.
-        
-        Anyone is free to copy, modify, publish, use, compile, sell, or
-        distribute this software, either in source code form or as a compiled
-        binary, for any purpose, commercial or non-commercial, and by any
-        means.
-        
-        In jurisdictions that recognize copyright laws, the author or authors
-        of this software dedicate any and all copyright interest in the
-        software to the public domain. We make this dedication for the benefit
-        of the public at large and to the detriment of our heirs and
-        successors. We intend this dedication to be an overt act of
-        relinquishment in perpetuity of all present and future rights to this
-        software under copyright law.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-        ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-        OTHER DEALINGS IN THE SOFTWARE.
-        
-        For more information, please refer to <http://unlicense.org/>
-        
-Project-URL: Repository, https://github.com/attwad/python-osc
-Keywords: osc,sound,midi,music
+         
+         Anyone is free to copy, modify, publish, use, compile, sell, or
+         distribute this software, either in source code form or as a compiled
+         binary, for any purpose, commercial or non-commercial, and by any
+         means.
+         
+         In jurisdictions that recognize copyright laws, the author or authors
+         of this software dedicate any and all copyright interest in the
+         software to the public domain. We make this dedication for the benefit
+         of the public at large and to the detriment of our heirs and
+         successors. We intend this dedication to be an overt act of
+         relinquishment in perpetuity of all present and future rights to this
+         software under copyright law.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+         EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+         MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+         IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+         OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+         ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+         OTHER DEALINGS IN THE SOFTWARE.
+         
+         For more information, please refer to <http://unlicense.org/>
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: Freely Distributable
@@ -37,8 +36,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Multimedia :: Sound/Audio
 Classifier: Topic :: System :: Networking
 Requires-Python: >=3.10
+Project-URL: Repository, https://github.com/attwad/python-osc
 Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
 
 ==========
 python-osc

{python_osc-1.9.2 → python_osc-1.10.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["uv-build"]
+build-backend = "uv_build"
 
 [project]
 name = "python-osc"
-version = "1.9.2"
+version = "1.10.0"
 description = "Open Sound Control server and client implementations in pure Python"
 readme = "README.rst"
 requires-python = ">=3.10"
@@ -21,10 +21,23 @@ classifiers = [
     "Topic :: Multimedia :: Sound/Audio",
     "Topic :: System :: Networking",
 ]
+dependencies = []
 
 [project.urls]
 Repository = "https://github.com/attwad/python-osc"
 
+[dependency-groups]
+dev = [
+    "pytest",
+    "mypy",
+    "ruff",
+    "pytest-cov",
+]
+
+[tool.uv.build-backend]
+module-name = "pythonosc"
+module-root = "."
+
 [tool.mypy]
 # Would be great to turn this on, however there's too many cases it would break
 # right now.

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/dispatcher.py

@@ -1,5 +1,4 @@
-"""Maps OSC addresses to handler functions
-"""
+"""Maps OSC addresses to handler functions"""
 
 import collections
 import inspect
@@ -183,28 +182,62 @@ class Dispatcher(object):
     ) -> Generator[Handler, None, None]:
         """Yields handlers matching an address
 
-
         Args:
             address_pattern: Address to match
 
         Returns:
             Generator yielding Handlers matching address_pattern
         """
-        # First convert the address_pattern into a matchable regexp.
-        # '?' in the OSC Address Pattern matches any single character.
-        # Let's consider numbers and _ "characters" too here, it's not said
-        # explicitly in the specification but it sounds good.
-        escaped_address_pattern = re.escape(address_pattern)
-        pattern = escaped_address_pattern.replace("\\?", "\\w?")
-        # '*' in the OSC Address Pattern matches any sequence of zero or more
-        # characters.
-        pattern = pattern.replace("\\*", "[\\w|\\+]*")
-        # The rest of the syntax in the specification is like the re module so
-        # we're fine.
-        pattern = f"{pattern}$"
-        patterncompiled = re.compile(pattern)
-        matched = False
+        # Convert OSC Address Pattern to a Python regular expression.
+        # Spec: https://opensoundcontrol.stanford.edu/spec-1_0.html#osc-address-patterns
+
+        pattern = "^"
+        i = 0
+        while i < len(address_pattern):
+            c = address_pattern[i]
+            if c == "*":
+                pattern += "[^/]*"
+            elif c == "?":
+                pattern += "[^/]"
+            elif c == "[":
+                pattern += "["
+                i += 1
+                if i < len(address_pattern) and address_pattern[i] == "!":
+                    pattern += "^"
+                    i += 1
+                while i < len(address_pattern) and address_pattern[i] != "]":
+                    if address_pattern[i] in r"\^$.|()+*?":
+                        pattern += "\\"
+                    pattern += address_pattern[i]
+                    i += 1
+                pattern += "]"
+            elif c == "{":
+                pattern += "("
+                i += 1
+                while i < len(address_pattern) and address_pattern[i] != "}":
+                    char = address_pattern[i]
+                    if char == ",":
+                        pattern += "|"
+                    elif char in r"\^$.|()[]+*?":
+                        pattern += "\\" + char
+                    else:
+                        pattern += char
+                    i += 1
+                pattern += ")"
+            elif c in r"\^$.|()[]+?":
+                pattern += "\\" + c
+            else:
+                pattern += c
+            i += 1
+        pattern += "$"
 
+        try:
+            patterncompiled = re.compile(pattern)
+        except re.error:
+            # If the pattern is invalid, it won't match anything.
+            return
+
+        matched = False
         for addr, handlers in self._map.items():
             if patterncompiled.match(addr) or (
                 ("*" in addr)
@@ -317,7 +350,7 @@ class Dispatcher(object):
                             )
                     if result:
                         results.append(result)
-        except osc_packet.ParseError as e:
+        except osc_packet.ParseError:
             pass
         return results
 

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_bundle_builder.py

@@ -25,9 +25,11 @@ class OscBundleBuilder(object):
                        seconds since the epoch in UTC or IMMEDIATELY.
         """
         self._timestamp = timestamp
-        self._contents: List[osc_bundle.OscBundle] = []
+        self._contents: List[osc_bundle.OscBundle | osc_message.OscMessage] = []
 
-    def add_content(self, content: osc_bundle.OscBundle) -> None:
+    def add_content(
+        self, content: osc_bundle.OscBundle | osc_message.OscMessage
+    ) -> None:
         """Add a new content to this bundle.
 
         Args:

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_message.py

@@ -34,8 +34,12 @@ class OscMessage(object):
 
             # Get the parameters types.
             type_tag, index = osc_types.get_string(self._dgram, index)
-            if type_tag.startswith(","):
-                type_tag = type_tag[1:]
+            if not type_tag.startswith(","):
+                raise ParseError(
+                    f"OSC Type Tag String must start with a comma, got: {type_tag}"
+                )
+
+            type_tag = type_tag[1:]
 
             params = []  # type: List[Any]
             param_stack = [params]

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_message_builder.py

@@ -5,7 +5,7 @@ from typing import Any, Iterable, List, Optional, Tuple, Union
 from pythonosc import osc_message
 from pythonosc.parsing import osc_types
 
-ArgValue = Union[str, bytes, bool, int, float, osc_types.MidiPacket, list]
+ArgValue = Union[str, bytes, bool, int, float, osc_types.MidiPacket, list, None]
 
 
 class BuildError(Exception):
@@ -96,7 +96,7 @@ class OscMessageBuilder(object):
             arg_type = self._get_arg_type(arg_value)
         if isinstance(arg_type, list):
             self._args.append((self.ARG_TYPE_ARRAY_START, None))
-            for v, t in zip(arg_value, arg_type):  # type: ignore[var-annotated, arg-type]
+            for v, t in zip(arg_value, arg_type):  # type: ignore[arg-type]
                 self.add_arg(v, t)
             self._args.append((self.ARG_TYPE_ARRAY_STOP, None))
         else:
@@ -121,7 +121,7 @@ class OscMessageBuilder(object):
         elif arg_value is False:
             arg_type = self.ARG_TYPE_FALSE
         elif isinstance(arg_value, int):
-            if arg_value.bit_length() > 32:
+            if arg_value.bit_length() > 31:
                 arg_type = self.ARG_TYPE_INT64
             else:
                 arg_type = self.ARG_TYPE_INT
@@ -134,7 +134,7 @@ class OscMessageBuilder(object):
         elif arg_value is None:
             arg_type = self.ARG_TYPE_NIL
         else:
-            raise ValueError("Infered arg_value type is not supported")
+            raise ValueError("Inferred arg_value type is not supported")
         return arg_type
 
     def build(self) -> osc_message.OscMessage:
@@ -195,7 +195,7 @@ class OscMessageBuilder(object):
 
 def build_msg(address: str, value: ArgValue = "") -> osc_message.OscMessage:
     builder = OscMessageBuilder(address=address)
-    values: ArgValue
+    values: Iterable[Any]
     if value == "":
         values = []
     elif not isinstance(value, Iterable) or isinstance(value, (str, bytes)):

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_packet.py

@@ -72,8 +72,7 @@ class OscPacket(object):
             else:
                 # Empty packet, should not happen as per the spec but heh, UDP...
                 raise ParseError(
-                    "OSC Packet should at least contain an OscMessage or an "
-                    "OscBundle."
+                    "OSC Packet should at least contain an OscMessage or an OscBundle."
                 )
         except (osc_bundle.ParseError, osc_message.ParseError) as pe:
             raise ParseError(f"Could not parse packet {pe}")

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_server.py

@@ -1,5 +1,4 @@
-"""OSC Servers that receive UDP packets and invoke handlers accordingly.
-"""
+"""OSC Servers that receive UDP packets and invoke handlers accordingly."""
 
 import asyncio
 import os

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/osc_tcp_server.py

@@ -75,7 +75,7 @@ class _TCPHandler1_0(socketserver.BaseRequestHandler):
             )
             # resp = _call_handlers_for_packet(data, self.server.dispatcher)
             for r in resp:
-                if not isinstance(r, list):
+                if not isinstance(r, tuple):
                     r = [r]
                 msg = osc_message_builder.build_msg(r[0], r[1:])
                 b = struct.pack("!I", len(msg.dgram))
@@ -117,7 +117,7 @@ class _TCPHandler1_1(socketserver.BaseRequestHandler):
                     p, self.client_address
                 )
                 for r in resp:
-                    if not isinstance(r, list):
+                    if not isinstance(r, tuple):
                         r = [r]
                     msg = osc_message_builder.build_msg(r[0], r[1:])
                     self.request.sendall(slip.encode(msg.dgram))
@@ -284,7 +284,7 @@ class AsyncOSCTCPServer:
                 buf, client_address
             )
             for r in result:
-                if not isinstance(r, list):
+                if not isinstance(r, tuple):
                     r = [r]
                 msg = osc_message_builder.build_msg(r[0], r[1:])
                 b = struct.pack("!I", len(msg.dgram))
@@ -319,7 +319,7 @@ class AsyncOSCTCPServer:
                     p, client_address
                 )
                 for r in result:
-                    if not isinstance(r, list):
+                    if not isinstance(r, tuple):
                         r = [r]
                     msg = osc_message_builder.build_msg(r[0], r[1:])
                     writer.write(slip.encode(msg.dgram))

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/parsing/osc_types.py

@@ -71,24 +71,21 @@ def get_string(dgram: bytes, start_index: int) -> Tuple[str, int]:
         raise ParseError("start_index < 0")
     offset = 0
     try:
-        if (
-            len(dgram) > start_index + _STRING_DGRAM_PAD
-            and dgram[start_index + _STRING_DGRAM_PAD] == _EMPTY_STR_DGRAM
-        ):
-            return "", start_index + _STRING_DGRAM_PAD
         while dgram[start_index + offset] != 0:
             offset += 1
-        # Align to a byte word.
-        if (offset) % _STRING_DGRAM_PAD == 0:
-            offset += _STRING_DGRAM_PAD
-        else:
-            offset += -offset % _STRING_DGRAM_PAD
-        # Python slices do not raise an IndexError past the last index,
-        # do it ourselves.
-        if offset > len(dgram[start_index:]):
+
+        # OSC spec: "followed by a null, followed by 0-3 additional null characters
+        # to make the total number of bits a multiple of 32"
+        # This means the total length (including the first null) must be a multiple of 4.
+        total_len = offset + 1
+        if total_len % 4 != 0:
+            total_len += 4 - (total_len % 4)
+
+        if start_index + total_len > len(dgram):
             raise ParseError("Datagram is too short")
+
         data_str = dgram[start_index : start_index + offset]
-        return data_str.replace(b"\x00", b"").decode("utf-8"), start_index + offset
+        return data_str.decode("utf-8"), start_index + total_len
     except IndexError as ie:
         raise ParseError(f"Could not parse datagram {ie}")
     except TypeError as te:
@@ -214,11 +211,8 @@ def get_timetag(dgram: bytes, start_index: int) -> Tuple[Tuple[datetime, int], i
         timetag, _ = get_uint64(dgram, start_index)
         seconds, fraction = ntp.parse_timestamp(timetag)
 
-        hours, seconds = seconds // 3600, seconds % 3600
-        minutes, seconds = seconds // 60, seconds % 60
-
         utc = datetime.combine(ntp._NTP_EPOCH, datetime.min.time()) + timedelta(
-            hours=hours, minutes=minutes, seconds=seconds
+            seconds=seconds
         )
 
         return (utc, fraction), start_index + _TIMETAG_DGRAM_LEN

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/tcp_client.py

@@ -122,6 +122,25 @@ class SimpleTCPClient(TCPClient):
             r = self.receive(timeout)
 
 
+class TCPDispatchClient(SimpleTCPClient):
+    """OSC TCP Client that includes a :class:`Dispatcher` for handling responses and other messages from the server"""
+
+    dispatcher = Dispatcher()
+
+    def handle_messages(self, timeout_sec: int = 30) -> None:
+        """Wait :int:`timeout` seconds for a message from the server and process each message with the registered
+        handlers.  Continue until a timeout occurs.
+
+        Args:
+            timeout: Time in seconds to wait for a message
+        """
+        r = self.receive(timeout_sec)
+        while r:
+            for m in r:
+                self.dispatcher.call_handlers_for_packet(m, (self.address, self.port))
+            r = self.receive(timeout_sec)
+
+
 class AsyncTCPClient:
     """Async OSC client to send :class:`OscMessage` or :class:`OscBundle` via TCP"""
 

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/parsing/test_osc_types.py

@@ -85,10 +85,10 @@ class TestRGBA(unittest.TestCase):
             b"\x00\x00\x00\x01": (1, 4),
             b"\x00\x00\x00\x02": (2, 4),
             b"\x00\x00\x00\x03": (3, 4),
-            b"\xFF\x00\x00\x00": (4278190080, 4),
-            b"\x00\xFF\x00\x00": (16711680, 4),
-            b"\x00\x00\xFF\x00": (65280, 4),
-            b"\x00\x00\x00\xFF": (255, 4),
+            b"\xff\x00\x00\x00": (4278190080, 4),
+            b"\x00\xff\x00\x00": (16711680, 4),
+            b"\x00\x00\xff\x00": (65280, 4),
+            b"\x00\x00\x00\xff": (255, 4),
             b"\x00\x00\x00\x01GARBAGE": (1, 4),
         }
 
@@ -164,7 +164,7 @@ class TestDate(unittest.TestCase):
                 (datetime(1900, 1, 1, 0, 0, 0), 0),
                 8,
             ),
-            b"\x83\xaa\x7E\x80\x0A\x00\xB0\x0C": (
+            b"\x83\xaa\x7e\x80\x0a\x00\xb0\x0c": (
                 (datetime(1970, 1, 1, 0, 0, 0), 167817228),
                 8,
             ),

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_bundle.py

@@ -46,7 +46,7 @@ _DGRAM_TWO_MESSAGES_IN_BUNDLE = (
     b"?\x00\x00\x00"
 )
 
-_DGRAM_EMPTY_BUNDLE = b"#bundle\x00" b"\x00\x00\x00\x00\x00\x00\x00\x01"
+_DGRAM_EMPTY_BUNDLE = b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01"
 
 _DGRAM_BUNDLE_IN_BUNDLE = (
     b"#bundle\x00"
@@ -60,20 +60,14 @@ _DGRAM_BUNDLE_IN_BUNDLE = (
     b"?\x00\x00\x00"
 )
 
-_DGRAM_INVALID = b"#bundle\x00" b"\x00\x00\x00"
+_DGRAM_INVALID = b"#bundle\x00\x00\x00\x00"
 
 _DGRAM_INVALID_INDEX = (
-    b"#bundle\x00"
-    b"\x00\x00\x00\x00\x00\x00\x00\x01"
-    b"\x00\x00\x00\x20"
-    b"/SYNC\x00\x00\x00\x00"
+    b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x20/SYNC\x00\x00\x00\x00"
 )
 
 _DGRAM_UNKNOWN_TYPE = (
-    b"#bundle\x00"
-    b"\x00\x00\x00\x00\x00\x00\x00\x01"
-    b"\x00\x00\x00\x10"
-    b"iamnotaslash"
+    b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x10iamnotaslash"
 )
 
 

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_message.py

@@ -5,11 +5,11 @@ from pythonosc import osc_message
 from datetime import datetime
 
 # Datagrams sent by Reaktor 5.8 by Native Instruments (c).
-_DGRAM_KNOB_ROTATES = b"/FB\x00" b",f\x00\x00" b">xca=q"
+_DGRAM_KNOB_ROTATES = b"/FB\x00,f\x00\x00>xca=q"
 
-_DGRAM_SWITCH_GOES_OFF = b"/SYNC\x00\x00\x00" b",f\x00\x00" b"\x00\x00\x00\x00"
+_DGRAM_SWITCH_GOES_OFF = b"/SYNC\x00\x00\x00,f\x00\x00\x00\x00\x00\x00"
 
-_DGRAM_SWITCH_GOES_ON = b"/SYNC\x00\x00\x00" b",f\x00\x00" b"?\x00\x00\x00"
+_DGRAM_SWITCH_GOES_ON = b"/SYNC\x00\x00\x00,f\x00\x00?\x00\x00\x00"
 
 _DGRAM_NO_PARAMS = b"/SYNC\x00\x00\x00"
 
@@ -22,15 +22,7 @@ _DGRAM_ALL_STANDARD_TYPES_OF_PARAMS = (
     b"\x00\x00\x00\x08stuff\x00\x00\x00"
 )  # b"stuff\x00\x00\x00"
 
-_DGRAM_ALL_NON_STANDARD_TYPES_OF_PARAMS = (
-    b"/SYNC\x00\x00\x00"
-    b"T"  # True
-    b"F"  # False
-    b"N"  # Nil
-    b"[]th\x00"  # Empty array
-    b"\x00\x00\x00\x00\x00\x00\x00\x00"
-    b"\x00\x00\x00\xe8\xd4\xa5\x10\x00"  # 1000000000000
-)
+_DGRAM_ALL_NON_STANDARD_TYPES_OF_PARAMS = b"/SYNC\x00\x00\x00,TFN[]th\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe8\xd4\xa5\x10\x00"
 
 _DGRAM_COMPLEX_ARRAY_PARAMS = (
     b"/SYNC\x00\x00\x00"

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_message_builder.py

@@ -19,7 +19,7 @@ class TestOscMessageBuilder(unittest.TestCase):
         builder = osc_message_builder.OscMessageBuilder("")
         self.assertRaises(ValueError, builder.add_arg, "what?", 1)
 
-    def test_add_arg_invalid_infered_type(self):
+    def test_add_arg_invalid_inferred_type(self):
         builder = osc_message_builder.OscMessageBuilder("")
         self.assertRaises(ValueError, builder.add_arg, {"name": "John"})
 

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_packet.py

@@ -17,7 +17,7 @@ _DGRAM_TWO_MESSAGES_IN_BUNDLE = (
     b"?\x00\x00\x00"
 )
 
-_DGRAM_EMPTY_BUNDLE = b"#bundle\x00" b"\x00\x00\x00\x00\x00\x00\x00\x01"
+_DGRAM_EMPTY_BUNDLE = b"#bundle\x00\x00\x00\x00\x00\x00\x00\x00\x01"
 
 _DGRAM_NESTED_MESS = (
     b"#bundle\x00"

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_server.py

@@ -3,7 +3,7 @@ import unittest.mock
 
 from pythonosc import dispatcher, osc_server
 
-_SIMPLE_PARAM_INT_MSG = b"/SYNC\x00\x00\x00" b",i\x00\x00" b"\x00\x00\x00\x04"
+_SIMPLE_PARAM_INT_MSG = b"/SYNC\x00\x00\x00,i\x00\x00\x00\x00\x00\x04"
 
 # Regression test for a datagram that should NOT be stripped, ever...
 _SIMPLE_PARAM_INT_9 = b"/debug\x00\x00,i\x00\x00\x00\x00\x00\t"

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_osc_tcp_server.py

@@ -5,7 +5,7 @@ import unittest.mock as mock
 from pythonosc import dispatcher, osc_tcp_server
 from pythonosc.slip import END
 
-_SIMPLE_PARAM_INT_MSG = b"/SYNC\x00\x00\x00" b",i\x00\x00" b"\x00\x00\x00\x04"
+_SIMPLE_PARAM_INT_MSG = b"/SYNC\x00\x00\x00,i\x00\x00\x00\x00\x00\x04"
 
 LEN_SIMPLE_PARAM_INT_MSG = struct.pack("!I", len(_SIMPLE_PARAM_INT_MSG))
 _SIMPLE_PARAM_INT_MSG_1_1 = END + _SIMPLE_PARAM_INT_MSG + END
@@ -95,12 +95,12 @@ class TestTCP_1_1_Handler(unittest.TestCase):
 
     def test_response_with_args(self):
         def respond(*args, **kwargs):
-            return [
+            return (
                 "/SYNC",
                 1,
                 "2",
                 3.0,
-            ]
+            )
 
         self.dispatcher.map("/SYNC", respond)
         mock_sock = mock.Mock()
@@ -208,12 +208,12 @@ class TestTCP_1_0_Handler(unittest.TestCase):
 
     def test_response_with_args(self):
         def respond(*args, **kwargs):
-            return [
+            return (
                 "/SYNC",
                 1,
                 "2",
                 3.0,
-            ]
+            )
 
         self.dispatcher.map("/SYNC", respond)
         mock_sock = mock.Mock()
@@ -314,12 +314,12 @@ class TestAsync1_1Handler(unittest.IsolatedAsyncioTestCase):
 
     async def test_response_with_args(self):
         def respond(*args, **kwargs):
-            return [
+            return (
                 "/SYNC",
                 1,
                 "2",
                 3.0,
-            ]
+            )
 
         self.dispatcher.map("/SYNC", respond)
         self.mock_reader.read.side_effect = [_SIMPLE_MSG_NO_PARAMS_1_1, b""]
@@ -332,12 +332,12 @@ class TestAsync1_1Handler(unittest.IsolatedAsyncioTestCase):
 
     async def test_async_response_with_args(self):
         async def respond(*args, **kwargs):
-            return [
+            return (
                 "/SYNC",
                 1,
                 "2",
                 3.0,
-            ]
+            )
 
         self.dispatcher.map("/SYNC", respond)
         self.mock_reader.read.side_effect = [_SIMPLE_MSG_NO_PARAMS_1_1, b""]

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/test/test_udp_client.py

@@ -48,5 +48,21 @@ class TestSimpleUdpClient(unittest.TestCase):
         self.assertEqual(self.builder.add_arg.call_count, 3)
 
 
+class TestUdpClientClose(unittest.TestCase):
+    @mock.patch("socket.socket")
+    def test_close(self, mock_socket_ctor):
+        mock_socket = mock_socket_ctor.return_value
+        client = udp_client.UDPClient("::1", 31337)
+        client.close()
+        self.assertTrue(mock_socket.close.called)
+
+    @mock.patch("socket.socket")
+    def test_context_manager(self, mock_socket_ctor):
+        mock_socket = mock_socket_ctor.return_value
+        with udp_client.UDPClient("::1", 31337) as client:
+            self.assertIsInstance(client, udp_client.UDPClient)
+        self.assertTrue(mock_socket.close.called)
+
+
 if __name__ == "__main__":
     unittest.main()

{python_osc-1.9.2 → python_osc-1.10.0}/pythonosc/udp_client.py

@@ -55,6 +55,18 @@ class UDPClient(object):
         self._address = address
         self._port = port
 
+    def __enter__(self) -> "UDPClient":
+        return self
+
+    def __exit__(
+        self, exc_type: type | None, exc_val: Exception | None, exc_tb: object | None
+    ) -> None:
+        self.close()
+
+    def close(self) -> None:
+        """Close the socket"""
+        self._sock.close()
+
     def send(self, content: Union[OscMessage, OscBundle]) -> None:
         """Sends an :class:`OscMessage` or :class:`OscBundle` via UDP
 
@@ -87,7 +99,6 @@ class SimpleUDPClient(UDPClient):
             value: One or more arguments to be added to the message
         """
         builder = OscMessageBuilder(address=address)
-        values: ArgValue
         if value is None:
             pass
         elif not isinstance(value, Iterable) or isinstance(value, (str, bytes)):

python_osc-1.9.2/MANIFEST.in

@@ -1,3 +0,0 @@
-include README.rst
-include LICENSE.txt
-include pythonosc/py.typed

python_osc-1.9.2/PKG-INFO

@@ -1,198 +0,0 @@
-Metadata-Version: 2.1
-Name: python-osc
-Version: 1.9.2
-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.
-        
-        Anyone is free to copy, modify, publish, use, compile, sell, or
-        distribute this software, either in source code form or as a compiled
-        binary, for any purpose, commercial or non-commercial, and by any
-        means.
-        
-        In jurisdictions that recognize copyright laws, the author or authors
-        of this software dedicate any and all copyright interest in the
-        software to the public domain. We make this dedication for the benefit
-        of the public at large and to the detriment of our heirs and
-        successors. We intend this dedication to be an overt act of
-        relinquishment in perpetuity of all present and future rights to this
-        software under copyright law.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-        ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-        OTHER DEALINGS IN THE SOFTWARE.
-        
-        For more information, please refer to <http://unlicense.org/>
-        
-Project-URL: Repository, https://github.com/attwad/python-osc
-Keywords: osc,sound,midi,music
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: Freely Distributable
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Multimedia :: Sound/Audio
-Classifier: Topic :: System :: Networking
-Requires-Python: >=3.10
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-
-==========
-python-osc
-==========
-
-Open Sound Control server and client implementations in **pure python**.
-
-.. image:: https://github.com/attwad/python-osc/actions/workflows/python-test.yml/badge.svg
-    :target: https://github.com/attwad/python-osc/actions/workflows/python-test.yml
-
-
-Current status
-==============
-
-This library was developed following the
-`OpenSoundControl Specification 1.0 <https://opensoundcontrol.stanford.edu/spec-1_0.html>`_
-and is currently in a stable state.
-
-Features
-========
-
-* 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
-
-Documentation
-=============
-
-Available at https://python-osc.readthedocs.io/.
-
-Installation
-============
-
-python-osc is a pure python library that has no external dependencies,
-to install it just use pip (prefered):
-
-.. image:: https://img.shields.io/pypi/v/python-osc.svg
-    :target: https://pypi.python.org/pypi/python-osc
-
-.. code-block:: bash
-
-    $ pip install python-osc
-
-Examples
-========
-
-Simple client
--------------
-
-.. code-block:: python
-
-  """Small example OSC client
-
-  This program sends 10 random values between 0.0 and 1.0 to the /filter address,
-  waiting for 1 seconds between each value.
-  """
-  import argparse
-  import random
-  import time
-
-  from pythonosc import udp_client
-
-
-  if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--ip", default="127.0.0.1",
-        help="The ip of the OSC server")
-    parser.add_argument("--port", type=int, default=5005,
-        help="The port the OSC server is listening on")
-    args = parser.parse_args()
-
-    client = udp_client.SimpleUDPClient(args.ip, args.port)
-
-    for x in range(10):
-      client.send_message("/filter", random.random())
-      time.sleep(1)
-
-Simple server
--------------
-
-.. code-block:: python
-
-  """Small example OSC server
-
-  This program listens to several addresses, and prints some information about
-  received packets.
-  """
-  import argparse
-  import math
-
-  from pythonosc.dispatcher import Dispatcher
-  from pythonosc import osc_server
-
-  def print_volume_handler(unused_addr, args, volume):
-    print("[{0}] ~ {1}".format(args[0], volume))
-
-  def print_compute_handler(unused_addr, args, volume):
-    try:
-      print("[{0}] ~ {1}".format(args[0], args[1](volume)))
-    except ValueError: pass
-
-  if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--ip",
-        default="127.0.0.1", help="The ip to listen on")
-    parser.add_argument("--port",
-        type=int, default=5005, help="The port to listen on")
-    args = parser.parse_args()
-
-    dispatcher = Dispatcher()
-    dispatcher.map("/filter", print)
-    dispatcher.map("/volume", print_volume_handler, "Volume")
-    dispatcher.map("/logvolume", print_compute_handler, "Log volume", math.log)
-
-    server = osc_server.ThreadingOSCUDPServer(
-        (args.ip, args.port), dispatcher)
-    print("Serving on {}".format(server.server_address))
-    server.serve_forever()
-
-Building bundles
-----------------
-
-.. code-block:: python
-
-    from pythonosc import osc_bundle_builder
-    from pythonosc import osc_message_builder
-
-    bundle = osc_bundle_builder.OscBundleBuilder(
-        osc_bundle_builder.IMMEDIATELY)
-    msg = osc_message_builder.OscMessageBuilder(address="/SYNC")
-    msg.add_arg(4.0)
-    # Add 4 messages in the bundle, each with more arguments.
-    bundle.add_content(msg.build())
-    msg.add_arg(2)
-    bundle.add_content(msg.build())
-    msg.add_arg("value")
-    bundle.add_content(msg.build())
-    msg.add_arg(b"\x01\x02\x03")
-    bundle.add_content(msg.build())
-
-    sub_bundle = bundle.build()
-    # Now add the same bundle inside itself.
-    bundle.add_content(sub_bundle)
-    # The bundle has 5 elements in total now.
-
-    bundle = bundle.build()
-    # You can now send it via a client with the `.send()` method:
-    client.send(bundle)
-
-License?
-========
-Unlicensed, do what you want with it. (http://unlicense.org)

python_osc-1.9.2/python_osc.egg-info/SOURCES.txt

@@ -1,37 +0,0 @@
-LICENSE.txt
-MANIFEST.in
-README.rst
-pyproject.toml
-python_osc.egg-info/PKG-INFO
-python_osc.egg-info/SOURCES.txt
-python_osc.egg-info/dependency_links.txt
-python_osc.egg-info/top_level.txt
-pythonosc/__init__.py
-pythonosc/dispatcher.py
-pythonosc/osc_bundle.py
-pythonosc/osc_bundle_builder.py
-pythonosc/osc_message.py
-pythonosc/osc_message_builder.py
-pythonosc/osc_packet.py
-pythonosc/osc_server.py
-pythonosc/osc_tcp_server.py
-pythonosc/slip.py
-pythonosc/tcp_client.py
-pythonosc/udp_client.py
-pythonosc/parsing/__init__.py
-pythonosc/parsing/ntp.py
-pythonosc/parsing/osc_types.py
-pythonosc/test/__init__.py
-pythonosc/test/test_dispatcher.py
-pythonosc/test/test_osc_bundle.py
-pythonosc/test/test_osc_bundle_builder.py
-pythonosc/test/test_osc_message.py
-pythonosc/test/test_osc_message_builder.py
-pythonosc/test/test_osc_packet.py
-pythonosc/test/test_osc_server.py
-pythonosc/test/test_osc_tcp_server.py
-pythonosc/test/test_tcp_client.py
-pythonosc/test/test_udp_client.py
-pythonosc/test/parsing/__init__.py
-pythonosc/test/parsing/test_ntp.py
-pythonosc/test/parsing/test_osc_types.py

python_osc-1.9.2/python_osc.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

python_osc-1.9.2/python_osc.egg-info/top_level.txt

@@ -1 +0,0 @@
-pythonosc

python_osc-1.9.2/setup.cfg

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