From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 15 Apr 2014 16:01:44 +0000 (-0400)
Subject: asyncio.tasks: Make sure CoroWrapper.send proxies one argument correctly
X-Git-Tag: v3.5.0a1~1866
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=021b27482e650641f9f65319371bfa24fa46b224;p=thirdparty%2FPython%2Fcpython.git

asyncio.tasks: Make sure CoroWrapper.send proxies one argument correctly

Issue #21209.
---

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 0366da35fee1..0785e1071839 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -53,6 +53,8 @@ class CoroWrapper:
         # We use `*value` because of a bug in CPythons prior
         # to 3.4.1. See issue #21209 and test_yield_from_corowrapper
         # for details.  This workaround should be removed in 3.5.0.
+        if len(value) == 1:
+            value = value[0]
         return self.gen.send(value)
 
     def throw(self, exc):
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 45de8acc1a3b..2b90a108f725 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -1410,6 +1410,24 @@ class TaskTests(unittest.TestCase):
         finally:
             asyncio.tasks._DEBUG = old_debug
 
+    def test_yield_from_corowrapper_send(self):
+        def foo():
+            a = yield
+            return a
+
+        def call(arg):
+            cw = asyncio.tasks.CoroWrapper(foo(), foo)
+            cw.send(None)
+            try:
+                cw.send(arg)
+            except StopIteration as ex:
+                return ex.args[0]
+            else:
+                raise AssertionError('StopIteration was expected')
+
+        self.assertEqual(call((1, 2)), (1, 2))
+        self.assertEqual(call('spam'), 'spam')
+
 
 class GatherTestsBase: