changeset:   96770:3555f7b5eac6
branch:      3.5
parent:      96767:9bae275e99b3
parent:      96769:34460219c0e0
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Fri Jul 03 00:41:40 2015 -0400
description:
Merge 3.4 (Issue #24450)


diff -r 9bae275e99b3 -r 3555f7b5eac6 Lib/asyncio/coroutines.py
--- a/Lib/asyncio/coroutines.py	Fri Jul 03 00:35:02 2015 -0400
+++ b/Lib/asyncio/coroutines.py	Fri Jul 03 00:41:40 2015 -0400
@@ -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