summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-07-03 00:41:40 -0400
committerYury Selivanov <yselivanov@sprymix.com>2015-07-03 00:41:40 -0400
commit4c0dd9f7ff8d58c2da9cccd1ca1ad7ee96e29ce1 (patch)
treee38c1743591e0e00e09498d59afeca9a43229ee5
parent843dd97e4d9a86af88d5ee8e7d02e114a48f63ba (diff)
parent58d72c6ce3e014469cb00fe75f7ca6105124c73c (diff)
downloadcpython-4c0dd9f7ff8d58c2da9cccd1ca1ad7ee96e29ce1.tar.gz
Merge 3.4 (Issue #24450)
-rw-r--r--Lib/asyncio/coroutines.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
index a70eb1dd91..15475f23b4 100644
--- a/Lib/asyncio/coroutines.py
+++ b/Lib/asyncio/coroutines.py
@@ -145,6 +145,14 @@ class CoroWrapper:
__await__ = __iter__ # make compatible with 'await' expression
@property
+ def gi_yieldfrom(self):
+ return self.gen.gi_yieldfrom
+
+ @property
+ def cr_await(self):
+ return self.gen.cr_await
+
+ @property
def cr_running(self):
return self.gen.cr_running