Skip to content

Commit e2242ce

Browse files
authored
Fix Server and AsyncServer when emitting no data (miguelgrinberg#420)
1 parent d745477 commit e2242ce

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

socketio/asyncio_server.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,10 @@ async def _emit_internal(self, sid, event, data, namespace=None, id=None):
362362
# as a single argument
363363
if isinstance(data, tuple):
364364
data = list(data)
365-
else:
365+
elif data is not None:
366366
data = [data]
367+
else:
368+
data = []
367369
await self._send_packet(sid, packet.Packet(
368370
packet.EVENT, namespace=namespace, data=[event] + data, id=id,
369371
binary=None))

socketio/server.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,10 @@ def _emit_internal(self, sid, event, data, namespace=None, id=None):
573573
# as a single argument
574574
if isinstance(data, tuple):
575575
data = list(data)
576-
else:
576+
elif data is not None:
577577
data = [data]
578+
else:
579+
data = []
578580
self._send_packet(sid, packet.Packet(packet.EVENT, namespace=namespace,
579581
data=[event] + data, id=id,
580582
binary=binary))

0 commit comments

Comments
 (0)