summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-07-03 04:41:40 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-07-03 04:41:40 (GMT)
commit27be130ec71fa95e2496bd9e42505aa6c7457682 (patch)
tree554fc6db64eec2f962e843e36135508ef1545082
parent53e623075dbcba2afaffc859c2fae9bff48e9abf (diff)
parent09e60588389710232030a39b1ae9ba99542ba602 (diff)
downloadcpython-27be130ec71fa95e2496bd9e42505aa6c7457682.zip
cpython-27be130ec71fa95e2496bd9e42505aa6c7457682.tar.gz
cpython-27be130ec71fa95e2496bd9e42505aa6c7457682.tar.bz2
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 a70eb1d..15475f2 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