From 3963916efeccdb779584b48c9839ceda59fbe85a Mon Sep 17 00:00:00 2001 From: "fraser.todd" Date: Mon, 11 Aug 2025 14:13:07 +0100 Subject: [PATCH 1/4] OscBundleBuilder's contents now have correct typing --- pythonosc/osc_bundle_builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonosc/osc_bundle_builder.py b/pythonosc/osc_bundle_builder.py index ee28d6f..a8fe5d5 100644 --- a/pythonosc/osc_bundle_builder.py +++ b/pythonosc/osc_bundle_builder.py @@ -25,9 +25,9 @@ def __init__(self, timestamp: int) -> None: 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: From c9edc65113cb640f9461af3de928c5d1382c03ae Mon Sep 17 00:00:00 2001 From: "fraser.todd" Date: Mon, 11 Aug 2025 14:28:01 +0100 Subject: [PATCH 2/4] removed unused ignore --- pythonosc/osc_message_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonosc/osc_message_builder.py b/pythonosc/osc_message_builder.py index ebbc2cb..c17da45 100644 --- a/pythonosc/osc_message_builder.py +++ b/pythonosc/osc_message_builder.py @@ -96,7 +96,7 @@ def add_arg(self, arg_value: ArgValue, arg_type: Optional[str] = None) -> None: 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: From 12fa77a038bab9ab8fd1e9248a1ec0531ed85d5c Mon Sep 17 00:00:00 2001 From: "fraser.todd" Date: Mon, 11 Aug 2025 16:36:50 +0100 Subject: [PATCH 3/4] black linting --- pythonosc/dispatcher.py | 3 +-- pythonosc/osc_bundle_builder.py | 4 +++- pythonosc/osc_server.py | 3 +-- pythonosc/test/parsing/test_osc_types.py | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pythonosc/dispatcher.py b/pythonosc/dispatcher.py index 680f26d..0ea9480 100644 --- a/pythonosc/dispatcher.py +++ b/pythonosc/dispatcher.py @@ -1,5 +1,4 @@ -"""Maps OSC addresses to handler functions -""" +"""Maps OSC addresses to handler functions""" import collections import inspect diff --git a/pythonosc/osc_bundle_builder.py b/pythonosc/osc_bundle_builder.py index a8fe5d5..37af6bb 100644 --- a/pythonosc/osc_bundle_builder.py +++ b/pythonosc/osc_bundle_builder.py @@ -27,7 +27,9 @@ def __init__(self, timestamp: int) -> None: self._timestamp = timestamp self._contents: List[osc_bundle.OscBundle | osc_message.OscMessage] = [] - def add_content(self, content: osc_bundle.OscBundle | osc_message.OscMessage) -> None: + def add_content( + self, content: osc_bundle.OscBundle | osc_message.OscMessage + ) -> None: """Add a new content to this bundle. Args: diff --git a/pythonosc/osc_server.py b/pythonosc/osc_server.py index b2fd5a9..aad0162 100644 --- a/pythonosc/osc_server.py +++ b/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 diff --git a/pythonosc/test/parsing/test_osc_types.py b/pythonosc/test/parsing/test_osc_types.py index 052a161..55e70b3 100644 --- a/pythonosc/test/parsing/test_osc_types.py +++ b/pythonosc/test/parsing/test_osc_types.py @@ -85,10 +85,10 @@ def test_get_rgba(self): 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 @@ def test_get_timetag(self): (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, ), From a17159ccf6e54e5369b9572756e4780da463fde3 Mon Sep 17 00:00:00 2001 From: "fraser.todd" Date: Mon, 11 Aug 2025 16:39:14 +0100 Subject: [PATCH 4/4] black linting --- pythonosc/osc_bundle_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonosc/osc_bundle_builder.py b/pythonosc/osc_bundle_builder.py index 37af6bb..7b9bf20 100644 --- a/pythonosc/osc_bundle_builder.py +++ b/pythonosc/osc_bundle_builder.py @@ -28,7 +28,7 @@ def __init__(self, timestamp: int) -> None: self._contents: List[osc_bundle.OscBundle | osc_message.OscMessage] = [] def add_content( - self, content: osc_bundle.OscBundle | osc_message.OscMessage + self, content: osc_bundle.OscBundle | osc_message.OscMessage ) -> None: """Add a new content to this bundle.