Skip to content

Expect Dispatcher replies for TCP to be tuples, not lists #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
attwad merged 1 commit into from
Jan 4, 2025
Merged

Expect Dispatcher replies for TCP to be tuples, not lists #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pythonosc/osc_tcp_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def handle(self) -> None:
)
# 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))
Expand Down Expand Up @@ -117,7 +117,7 @@ def handle(self) -> None:
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))
Expand Down Expand Up @@ -284,7 +284,7 @@ async def handle1_0(
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))
Expand Down Expand Up @@ -319,7 +319,7 @@ async def handle_1_1(
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))
Expand Down
16 changes: 8 additions & 8 deletions pythonosc/test/test_osc_tcp_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ def respond(*args, **kwargs):

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()
Expand Down Expand Up @@ -208,12 +208,12 @@ def respond(*args, **kwargs):

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()
Expand Down Expand Up @@ -314,12 +314,12 @@ def respond(*args, **kwargs):

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""]
Expand All @@ -332,12 +332,12 @@ def respond(*args, **kwargs):

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""]
Expand Down
Loading