changeset:   96768:4d3bd9b82a62
parent:      96766:f4058528ab8c
parent:      96767:9bae275e99b3
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Fri Jul 03 00:35:29 2015 -0400
description:
Merge 3.5 (Issue #24450)


diff -r f4058528ab8c -r 4d3bd9b82a62 Lib/test/test_types.py
--- a/Lib/test/test_types.py	Fri Jul 03 00:24:14 2015 -0400
+++ b/Lib/test/test_types.py	Fri Jul 03 00:35:29 2015 -0400
@@ -1295,8 +1295,8 @@
         self.assertIs(wrapper.__name__, gen.__name__)
 
         # Test AttributeErrors
-        for name in {'gi_running', 'gi_frame', 'gi_code',
-                     'cr_running', 'cr_frame', 'cr_code'}:
+        for name in {'gi_running', 'gi_frame', 'gi_code', 'gi_yieldfrom',
+                     'cr_running', 'cr_frame', 'cr_code', 'cr_await'}:
             with self.assertRaises(AttributeError):
                 getattr(wrapper, name)
 
@@ -1304,12 +1304,15 @@
         gen.gi_running = object()
         gen.gi_frame = object()
         gen.gi_code = object()
+        gen.gi_yieldfrom = object()
         self.assertIs(wrapper.gi_running, gen.gi_running)
         self.assertIs(wrapper.gi_frame, gen.gi_frame)
         self.assertIs(wrapper.gi_code, gen.gi_code)
+        self.assertIs(wrapper.gi_yieldfrom, gen.gi_yieldfrom)
         self.assertIs(wrapper.cr_running, gen.gi_running)
         self.assertIs(wrapper.cr_frame, gen.gi_frame)
         self.assertIs(wrapper.cr_code, gen.gi_code)
+        self.assertIs(wrapper.cr_await, gen.gi_yieldfrom)
 
         wrapper.close()
         gen.close.assert_called_once_with()
diff -r f4058528ab8c -r 4d3bd9b82a62 Lib/types.py
--- a/Lib/types.py	Fri Jul 03 00:24:14 2015 -0400
+++ b/Lib/types.py	Fri Jul 03 00:35:29 2015 -0400
@@ -188,9 +188,13 @@
     @property
     def gi_running(self):
         return self.__wrapped.gi_running
+    @property
+    def gi_yieldfrom(self):
+        return self.__wrapped.gi_yieldfrom
     cr_code = gi_code
     cr_frame = gi_frame
     cr_running = gi_running
+    cr_await = gi_yieldfrom
     def __next__(self):
         return next(self.__wrapped)
     def __iter__(self):