[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/cc093f3037bd
changeset:   97421:cc093f3037bd
parent:      97419:4610368e558a
parent:      97420:948d8ea8e7a6
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Mon Aug 17 13:04:49 2015 -0400
summary:
  Merge 3.5

files:
  Doc/library/inspect.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -209,9 +209,10 @@
 
 .. 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])

-- 
Repository URL: https://hg.python.org/cpython