From: Nikita Sobolev <mail@sobolevn.me>
Date: Sun, 20 Feb 2022 10:24:00 +0000 (+0300)
Subject: bpo-46672: fix `NameError` in `asyncio.gather` if type check fails (GH-31187)
X-Git-Tag: v3.11.0a6~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ab8167b9c60d1a04b2e3116d0c52db254b68cda;p=thirdparty%2FPython%2Fcpython.git

bpo-46672: fix `NameError` in `asyncio.gather` if type check fails (GH-31187)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
---

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index c11d0daaefea..25a650ffbb74 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 fe6bfb363f1c..40b33deb17ee 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 000000000000..9a76c29a334d
--- /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.