diff options
| author | Nikita Sobolev <mail@sobolevn.me> | 2022-02-20 10:24:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 10:24:00 (GMT) |
| commit | 4ab8167b9c60d1a04b2e3116d0c52db254b68cda (patch) | |
| tree | f7c1e79ff0941bfd8deca5e6dfccc0d527f87d8d | |
| parent | e7130c2e8c6abfaf04b209bd5b239059eda024b9 (diff) | |
| download | cpython-4ab8167b9c60d1a04b2e3116d0c52db254b68cda.zip cpython-4ab8167b9c60d1a04b2e3116d0c52db254b68cda.tar.gz cpython-4ab8167b9c60d1a04b2e3116d0c52db254b68cda.tar.bz2 | |
bpo-46672: fix `NameError` in `asyncio.gather` if type check fails (GH-31187)
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
| -rw-r--r-- | Lib/asyncio/tasks.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_tasks.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2022-02-07-13-15-16.bpo-46672.4swIjx.rst | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index c11d0da..25a650f 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -735,7 +735,7 @@ def gather(*coros_or_futures, return_exceptions=False): nonlocal nfinished nfinished += 1 - if outer.done(): + if outer is None or outer.done(): if not fut.cancelled(): # Mark exception retrieved. fut.exception() @@ -791,6 +791,7 @@ def gather(*coros_or_futures, return_exceptions=False): nfuts = 0 nfinished = 0 loop = None + outer = None # bpo-46672 for arg in coros_or_futures: if arg not in arg_to_fut: fut = _ensure_future(arg, loop=loop) diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index fe6bfb3..40b33de 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -3235,6 +3235,20 @@ class CoroutineGatherTests(GatherTestsBase, test_utils.TestCase): test_utils.run_briefly(self.one_loop) self.assertIsInstance(f.exception(), RuntimeError) + def test_issue46672(self): + with mock.patch( + 'asyncio.base_events.BaseEventLoop.call_exception_handler', + ): + async def coro(s): + return s + c = coro('abc') + + with self.assertRaises(TypeError): + self._gather(c, {}) + self._run_loop(self.one_loop) + # NameError should not happen: + self.one_loop.call_exception_handler.assert_not_called() + class RunCoroutineThreadsafeTests(test_utils.TestCase): """Test case for asyncio.run_coroutine_threadsafe.""" diff --git a/Misc/NEWS.d/next/Library/2022-02-07-13-15-16.bpo-46672.4swIjx.rst b/Misc/NEWS.d/next/Library/2022-02-07-13-15-16.bpo-46672.4swIjx.rst new file mode 100644 index 0000000..9a76c29 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-02-07-13-15-16.bpo-46672.4swIjx.rst @@ -0,0 +1 @@ +Fix ``NameError`` in :func:`asyncio.gather` when initial type check fails. |