From 1c615b975ccd6e36cf5c0474797b81882a5dbfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9phine=20Wolf=20Oberholtzer?= Date: Tue, 18 Feb 2025 19:31:14 -0500 Subject: [PATCH] OscBundle uses compact repr --- supriya/osc/messages.py | 60 ++++++++++------------------------------- tests/test_osc.py | 24 +++++------------ 2 files changed, 20 insertions(+), 64 deletions(-) diff --git a/supriya/osc/messages.py b/supriya/osc/messages.py index 878431abc..5d660dfab 100644 --- a/supriya/osc/messages.py +++ b/supriya/osc/messages.py @@ -6,8 +6,6 @@ from collections.abc import Sequence as SequenceABC from typing import List -from uqbar.objects import get_repr - from ..utils import group_by_count BUNDLE_PREFIX = b"#bundle\x00" @@ -109,23 +107,13 @@ class OscMessage: ... ["a", "b", ["c", "d"]], ... ) >>> osc_message - OscMessage('/foo', 1, 2.5, OscBundle( - contents=( - OscMessage('/bar', 'baz', 3.0), - OscMessage('/ffff', False, True, None), - ), - ), ['a', 'b', ['c', 'd']]) + OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']]) :: >>> datagram = osc_message.to_datagram() >>> OscMessage.from_datagram(datagram) - OscMessage('/foo', 1, 2.5, OscBundle( - contents=( - OscMessage('/bar', 'baz', 3.0), - OscMessage('/ffff', False, True, None), - ), - ), ['a', 'b', ['c', 'd']]) + OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']]) :: @@ -328,13 +316,7 @@ class OscBundle: ... contents=(message_one, message_two), ... ) >>> inner_bundle - OscBundle( - contents=( - OscMessage('/one', 1), - OscMessage('/two', 2), - ), - timestamp=1401557034.5, - ) + OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)]) :: @@ -351,18 +333,7 @@ class OscBundle: ... contents=(inner_bundle, message_three), ... ) >>> outer_bundle - OscBundle( - contents=( - OscBundle( - contents=( - OscMessage('/one', 1), - OscMessage('/two', 2), - ), - timestamp=1401557034.5, - ), - OscMessage('/three', 3), - ), - ) + OscBundle(contents=[OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)]), OscMessage('/three', 3)]) :: @@ -383,18 +354,7 @@ class OscBundle: >>> decoded_bundle = supriya.osc.OscBundle.from_datagram(datagram) >>> decoded_bundle - OscBundle( - contents=( - OscBundle( - contents=( - OscMessage('/one', 1), - OscMessage('/two', 2), - ), - timestamp=1401557034.5, - ), - OscMessage('/three', 3), - ), - ) + OscBundle(contents=[OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)]), OscMessage('/three', 3)]) :: @@ -425,7 +385,15 @@ def __eq__(self, other) -> bool: return True def __repr__(self) -> str: - return get_repr(self) + parts = ["{}(".format(type(self).__name__)] + if self.timestamp is not None: + parts.append(f"timestamp={self.timestamp}") + if self.contents: + parts.append(", ") + if self.contents: + parts.append(f"contents={list(self.contents)!r}") + parts.append(")") + return "".join(parts) def __str__(self) -> str: return format_datagram(bytearray(self.to_datagram())) diff --git a/tests/test_osc.py b/tests/test_osc.py index 81e0c7f69..66e4e6144 100644 --- a/tests/test_osc.py +++ b/tests/test_osc.py @@ -44,15 +44,9 @@ def test_OscMessage() -> None: ), ["a", "b", ["c", "d"]], ) - assert repr(osc_message) == normalize( - """ - OscMessage('/foo', 1, 2.5, OscBundle( - contents=( - OscMessage('/bar', 'baz', 3.0), - OscMessage('/ffff', False, True, None), - ), - ), ['a', 'b', ['c', 'd']]) - """ + assert ( + repr(osc_message) + == "OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])" ) assert str(osc_message) == normalize( """ @@ -69,15 +63,9 @@ def test_OscMessage() -> None: datagram = osc_message.to_datagram() new_osc_message = OscMessage.from_datagram(datagram) assert osc_message == new_osc_message - assert repr(new_osc_message) == normalize( - """ - OscMessage('/foo', 1, 2.5, OscBundle( - contents=( - OscMessage('/bar', 'baz', 3.0), - OscMessage('/ffff', False, True, None), - ), - ), ['a', 'b', ['c', 'd']]) - """ + assert ( + repr(new_osc_message) + == "OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])" )