Skip to content

Commit 469b7c0

Browse files
Ignore catch-all namespace in client connections (Fixes #1351)
1 parent d67a272 commit 469b7c0

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

src/socketio/async_client.py

+2
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ async def connect(self, url, headers={}, auth=None, transports=None,
128128
if namespaces is None:
129129
namespaces = list(set(self.handlers.keys()).union(
130130
set(self.namespace_handlers.keys())))
131+
if '*' in namespaces:
132+
namespaces.remove('*')
131133
if len(namespaces) == 0:
132134
namespaces = ['/']
133135
elif isinstance(namespaces, str):

src/socketio/client.py

+2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ def connect(self, url, headers={}, auth=None, transports=None,
126126
if namespaces is None:
127127
namespaces = list(set(self.handlers.keys()).union(
128128
set(self.namespace_handlers.keys())))
129+
if '*' in namespaces:
130+
namespaces.remove('*')
129131
if len(namespaces) == 0:
130132
namespaces = ['/']
131133
elif isinstance(namespaces, str):

tests/async/test_client.py

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ def test_connect_default_namespaces(self):
9898
c.eio.connect = AsyncMock()
9999
c.on('foo', mock.MagicMock(), namespace='/foo')
100100
c.on('bar', mock.MagicMock(), namespace='/')
101+
c.on('baz', mock.MagicMock(), namespace='*')
101102
_run(
102103
c.connect(
103104
'url',

tests/common/test_client.py

+1
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ def test_connect_default_namespaces(self):
236236
c.eio.connect = mock.MagicMock()
237237
c.on('foo', mock.MagicMock(), namespace='/foo')
238238
c.on('bar', mock.MagicMock(), namespace='/')
239+
c.on('baz', mock.MagicMock(), namespace='*')
239240
c.connect(
240241
'url',
241242
headers='headers',

0 commit comments

Comments
 (0)