From c35451421d2754c09c101c56590152d13cc8b0ea Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Wed, 27 Feb 2019 19:59:32 +0000 Subject: [PATCH] client disconnect does not take namespace as argument Fixes #259 --- socketio/asyncio_namespace.py | 5 ++--- socketio/namespace.py | 4 ++-- tests/asyncio/test_asyncio_namespace.py | 4 +--- tests/common/test_namespace.py | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/socketio/asyncio_namespace.py b/socketio/asyncio_namespace.py index e376875..12e9c0f 100644 --- a/socketio/asyncio_namespace.py +++ b/socketio/asyncio_namespace.py @@ -192,7 +192,7 @@ class AsyncClientNamespace(namespace.ClientNamespace): namespace=namespace or self.namespace, callback=callback) - async def disconnect(self, namespace=None): + async def disconnect(self): """Disconnect a client. The only difference with the :func:`socketio.Client.disconnect` method @@ -201,5 +201,4 @@ class AsyncClientNamespace(namespace.ClientNamespace): Note: this method is a coroutine. """ - return await self.client.disconnect( - namespace=namespace or self.namespace) + return await self.client.disconnect() diff --git a/socketio/namespace.py b/socketio/namespace.py index 30ab1bf..418615f 100644 --- a/socketio/namespace.py +++ b/socketio/namespace.py @@ -181,11 +181,11 @@ class ClientNamespace(BaseNamespace): return self.client.send(data, namespace=namespace or self.namespace, callback=callback) - def disconnect(self, namespace=None): + def disconnect(self): """Disconnect from the server. The only difference with the :func:`socketio.Client.disconnect` method is that when the ``namespace`` argument is not given the namespace associated with the class is used. """ - return self.client.disconnect(namespace=namespace or self.namespace) + return self.client.disconnect() diff --git a/tests/asyncio/test_asyncio_namespace.py b/tests/asyncio/test_asyncio_namespace.py index c3a3178..2916453 100644 --- a/tests/asyncio/test_asyncio_namespace.py +++ b/tests/asyncio/test_asyncio_namespace.py @@ -257,6 +257,4 @@ class TestAsyncNamespace(unittest.TestCase): mock_client.disconnect = AsyncMock() ns._set_client(mock_client) _run(ns.disconnect()) - ns.client.disconnect.mock.assert_called_with(namespace='/foo') - _run(ns.disconnect(namespace='/bar')) - ns.client.disconnect.mock.assert_called_with(namespace='/bar') + ns.client.disconnect.mock.assert_called_with() diff --git a/tests/common/test_namespace.py b/tests/common/test_namespace.py index b07e820..10eba66 100644 --- a/tests/common/test_namespace.py +++ b/tests/common/test_namespace.py @@ -170,6 +170,4 @@ class TestNamespace(unittest.TestCase): ns = namespace.ClientNamespace('/foo') ns._set_client(mock.MagicMock()) ns.disconnect() - ns.client.disconnect.assert_called_with(namespace='/foo') - ns.disconnect(namespace='/bar') - ns.client.disconnect.assert_called_with(namespace='/bar') + ns.client.disconnect.assert_called_with()