python-engineio 4.12.1__tar.gz → 4.12.2__tar.gz

{python_engineio-4.12.1/src/python_engineio.egg-info → python_engineio-4.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.1
+Version: 4.12.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.12.1 → python_engineio-4.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.12.1"
+version = "4.12.2"
 license = {text = "MIT"}
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"

{python_engineio-4.12.1 → python_engineio-4.12.2}/src/engineio/async_client.py

@@ -126,7 +126,6 @@ class AsyncClient(base_client.BaseClient):
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return await getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -199,11 +198,15 @@ class AsyncClient(base_client.BaseClient):
         """
         return await asyncio.sleep(seconds)
 
-    def create_queue(self):
+    def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = asyncio.Queue()
-        q.Empty = asyncio.QueueEmpty
-        return q
+        return asyncio.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return asyncio.QueueEmpty
 
     def create_event(self):
         """Create an event object."""
@@ -624,7 +627,7 @@ class AsyncClient(base_client.BaseClient):
             packets = None
             try:
                 packets = [await asyncio.wait_for(self.queue.get(), timeout)]
-            except (self.queue.Empty, asyncio.TimeoutError):
+            except (self.queue_empty, asyncio.TimeoutError):
                 self.logger.error('packet queue is empty, aborting')
                 break
             except asyncio.CancelledError:  # pragma: no cover
@@ -636,7 +639,7 @@ class AsyncClient(base_client.BaseClient):
                 while True:
                     try:
                         packets.append(self.queue.get_nowait())
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]

{python_engineio-4.12.1 → python_engineio-4.12.2}/src/engineio/async_drivers/asgi.py

@@ -280,9 +280,9 @@ class WebSocket:  # pragma: no cover
         event = await self.asgi_receive()
         if event['type'] != 'websocket.receive':
             raise OSError()
-        if 'bytes' in event:
+        if event.get('bytes', None) is not None:
             return event['bytes']
-        elif 'text' in event:
+        elif event.get('text', None) is not None:
             return event['text']
         else:  # pragma: no cover
             raise OSError()

{python_engineio-4.12.1 → python_engineio-4.12.2}/src/engineio/base_client.py

@@ -61,7 +61,8 @@ class BaseClient:
         self.ws = None
         self.read_loop_task = None
         self.write_loop_task = None
-        self.queue = None
+        self.queue = self.create_queue()
+        self.queue_empty = self.get_queue_empty_exception()
         self.state = 'disconnected'
         self.ssl_verify = ssl_verify
         self.websocket_extra_options = websocket_extra_options or {}
@@ -156,3 +157,13 @@ class BaseClient:
         if not self.timestamp_requests:
             return ''
         return '&t=' + str(time.time())
+
+    def create_queue(self, *args, **kwargs):  # pragma: no cover
+        """Create a queue object."""
+        raise NotImplementedError('must be implemented in a subclass')
+
+    def get_queue_empty_exception(self):  # pragma: no cover
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        raise NotImplementedError('must be implemented in a subclass')

{python_engineio-4.12.1 → python_engineio-4.12.2}/src/engineio/client.py

@@ -91,7 +91,6 @@ class Client(base_client.BaseClient):
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -162,9 +161,13 @@ class Client(base_client.BaseClient):
 
     def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = queue.Queue(*args, **kwargs)
-        q.Empty = queue.Empty
-        return q
+        return queue.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return queue.Empty
 
     def create_event(self, *args, **kwargs):
         """Create an event object."""
@@ -566,7 +569,7 @@ class Client(base_client.BaseClient):
             packets = None
             try:
                 packets = [self.queue.get(timeout=timeout)]
-            except self.queue.Empty:
+            except self.queue_empty:
                 self.logger.error('packet queue is empty, aborting')
                 break
             if packets == [None]:
@@ -576,7 +579,7 @@ class Client(base_client.BaseClient):
                 while True:
                     try:
                         packets.append(self.queue.get(block=False))
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]

{python_engineio-4.12.1 → python_engineio-4.12.2/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.12.1
+Version: 4.12.2
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License: MIT

{python_engineio-4.12.1 → python_engineio-4.12.2}/tests/async/test_client.py

@@ -225,7 +225,7 @@ class TestAsyncClient:
     async def test_create_queue(self):
         c = async_client.AsyncClient()
         q = c.create_queue()
-        with pytest.raises(q.Empty):
+        with pytest.raises(c.queue_empty):
             q.get_nowait()
 
     async def test_create_event(self):
@@ -1200,7 +1200,7 @@ class TestAsyncClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(side_effect=RuntimeError)
         await c._write_loop()
         c.queue.get.assert_awaited_once_with()
@@ -1213,7 +1213,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
@@ -1244,7 +1244,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
@@ -1285,7 +1285,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
@@ -1322,7 +1322,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[packet.Packet(packet.MESSAGE, {'foo': 'bar'})]
         )
@@ -1350,7 +1350,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[packet.Packet(packet.MESSAGE, {'foo': 'bar'})]
         )
@@ -1379,7 +1379,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
@@ -1401,7 +1401,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
@@ -1431,7 +1431,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[packet.Packet(packet.MESSAGE, b'foo'), RuntimeError]
         )
@@ -1450,7 +1450,7 @@ class TestAsyncClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get = mock.AsyncMock(
             side_effect=[
                 packet.Packet(packet.MESSAGE, {'foo': 'bar'}),

{python_engineio-4.12.1 → python_engineio-4.12.2}/tests/common/test_client.py

@@ -33,10 +33,11 @@ class TestClient:
             'ws',
             'read_loop_task',
             'write_loop_task',
-            'queue',
         ]:
             assert getattr(c, attr) is None, attr + ' is not None'
         assert c.state == 'disconnected'
+        assert c.queue.__class__.__name__ == 'Queue'
+        assert c.queue_empty.__name__ == 'Empty'
 
     def test_custom_json(self):
         client.Client()
@@ -289,7 +290,7 @@ class TestClient:
     def test_create_queue(self):
         c = client.Client()
         q = c.create_queue()
-        with pytest.raises(q.Empty):
+        with pytest.raises(c.queue_empty):
             q.get(timeout=0.01)
 
     def test_create_event(self):
@@ -1499,7 +1500,7 @@ class TestClient:
         c.ping_interval = 1
         c.ping_timeout = 2
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = RuntimeError
         c._write_loop()
         c.queue.get.assert_called_once_with(timeout=7)
@@ -1512,7 +1513,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             RuntimeError,
@@ -1541,7 +1542,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
@@ -1576,7 +1577,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
@@ -1610,7 +1611,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             RuntimeError,
@@ -1639,7 +1640,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'polling'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             RuntimeError,
@@ -1668,7 +1669,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             RuntimeError,
@@ -1688,7 +1689,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             packet.Packet(packet.PING),
@@ -1712,7 +1713,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, b'foo'),
             RuntimeError,
@@ -1732,7 +1733,7 @@ class TestClient:
         c.ping_timeout = 2
         c.current_transport = 'websocket'
         c.queue = mock.MagicMock()
-        c.queue.Empty = RuntimeError
+        c.queue_empty = RuntimeError
         c.queue.get.side_effect = [
             packet.Packet(packet.MESSAGE, {'foo': 'bar'}),
             RuntimeError,