From 35cc1fa3f6ff962676f571ae30851f4b4d96762a Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Sun, 24 Jan 2021 20:48:30 +0100 Subject: [PATCH] Also fix asyncio exception imports. The python documentation imports everything directly from the asyncio package, and it seems that py < 3.8 does not have the asyncio.exception module Change-Id: I4719185f02f3c8d030ff24601e15f81767ba7d5a --- lib/sqlalchemy/util/queue.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py index 30e3882480..0cee2f4115 100644 --- a/lib/sqlalchemy/util/queue.py +++ b/lib/sqlalchemy/util/queue.py @@ -237,7 +237,7 @@ class AsyncAdaptedQueue: def put_nowait(self, item): try: return self._queue.put_nowait(item) - except asyncio.queues.QueueFull as err: + except asyncio.QueueFull as err: compat.raise_( Full(), replace_context=err, @@ -254,10 +254,7 @@ class AsyncAdaptedQueue: ) else: return self.await_(self._queue.put(item)) - except ( - asyncio.queues.QueueFull, - asyncio.exceptions.TimeoutError, - ) as err: + except (asyncio.QueueFull, asyncio.TimeoutError) as err: compat.raise_( Full(), replace_context=err, @@ -266,7 +263,7 @@ class AsyncAdaptedQueue: def get_nowait(self): try: return self._queue.get_nowait() - except asyncio.queues.QueueEmpty as err: + except asyncio.QueueEmpty as err: compat.raise_( Empty(), replace_context=err, @@ -283,10 +280,7 @@ class AsyncAdaptedQueue: ) else: return self.await_(self._queue.get()) - except ( - asyncio.queues.QueueEmpty, - asyncio.exceptions.TimeoutError, - ) as err: + except (asyncio.QueueEmpty, asyncio.TimeoutError) as err: compat.raise_( Empty(), replace_context=err, -- 2.47.3