[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (Issue #24450)
yury.selivanov
python-checkins at python.org
Fri Jul 3 06:42:13 CEST 2015
https://hg.python.org/cpython/rev/3555f7b5eac6
changeset: 96770:3555f7b5eac6
branch: 3.5
parent: 96767:9bae275e99b3
parent: 96769:34460219c0e0
user: Yury Selivanov <yselivanov at sprymix.com>
date: Fri Jul 03 00:41:40 2015 -0400
summary:
Merge 3.4 (Issue #24450)
files:
Lib/asyncio/coroutines.py | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
--- a/Lib/asyncio/coroutines.py
+++ b/Lib/asyncio/coroutines.py
@@ -145,6 +145,14 @@
__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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list