diff options
| -rw-r--r-- | lib/sqlalchemy/util/queue.py | 14 | ||||
| -rw-r--r-- | test/base/test_concurrency_py3k.py | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py index 30e388248..0cee2f411 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, diff --git a/test/base/test_concurrency_py3k.py b/test/base/test_concurrency_py3k.py index 1492bc186..08c18b43e 100644 --- a/test/base/test_concurrency_py3k.py +++ b/test/base/test_concurrency_py3k.py @@ -161,6 +161,10 @@ class TestAsyncioCompat(fixtures.TestBase): class TestAsyncAdaptedQueue(fixtures.TestBase): + # uses asyncio.run() in alternate threads which is not available + # in Python 3.6 + __requires__ = ("python37",) + def test_lazy_init(self): run = [False] |