summaryrefslogtreecommitdiffstats
path: root/Lib/types.py
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-07-03 04:35:29 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-07-03 04:35:29 (GMT)
commitb166d58b9ea00ef4147efd5db99fd340228139c7 (patch)
tree6e3a3ba98e7c700e2a4b58043d07e98bf77182f7 /Lib/types.py
parentd6d0b5b1fa5cb0b4c8645e3446189b348dcf344c (diff)
parent53e623075dbcba2afaffc859c2fae9bff48e9abf (diff)
downloadcpython-b166d58b9ea00ef4147efd5db99fd340228139c7.zip
cpython-b166d58b9ea00ef4147efd5db99fd340228139c7.tar.gz
cpython-b166d58b9ea00ef4147efd5db99fd340228139c7.tar.bz2
Merge 3.5 (Issue #24450)
Diffstat (limited to 'Lib/types.py')
-rw-r--r--Lib/types.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/types.py b/Lib/types.py
index 38b453a..8c5fc65 100644
--- a/Lib/types.py
+++ b/Lib/types.py
@@ -188,9 +188,13 @@ class _GeneratorWrapper:
@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):