summaryrefslogtreecommitdiffstats
path: root/Doc/library/inspect.rst
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-08-17 17:04:49 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-08-17 17:04:49 (GMT)
commitd11223e0d65c42e3637f00cac595028373838436 (patch)
treea97840da52b14f12178afe04466d3c2925a8581a /Doc/library/inspect.rst
parent9e35cac3a1d3cfdc12ca4013e3c8b09db0a5e8ba (diff)
parent5fbad3c9f2aec878df213607c527a09e07ba7729 (diff)
downloadcpython-d11223e0d65c42e3637f00cac595028373838436.zip
cpython-d11223e0d65c42e3637f00cac595028373838436.tar.gz
cpython-d11223e0d65c42e3637f00cac595028373838436.tar.bz2
Merge 3.5
Diffstat (limited to 'Doc/library/inspect.rst')
-rw-r--r--Doc/library/inspect.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 027ba4b..af8cc09 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -209,9 +209,10 @@ attributes:
.. versionchanged:: 3.5
- Add ``__qualname__`` attribute to generators. The ``__name__`` attribute of
- generators is now set from the function name, instead of the code name, and
- it can now be modified.
+ Add ``__qualname__`` and ``gi_yieldfrom`` attributes to generators.
+
+ The ``__name__`` attribute of generators is now set from the function
+ name, instead of the code name, and it can now be modified.
.. function:: getmembers(object[, predicate])