Merge 3.4 (Issue #24450)

1st1 · 1st1 · commit 27be130ec71f · 2015-07-03T00:41:40.000-04:00
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
@@ -144,6 +144,14 @@ def gi_code(self):
 
         __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
