Merge 3.5

d11223e0 · Yury Selivanov · 9e35cac3 · 5fbad3c9 · d11223e0
Kaydet (Commit) d11223e0 authored Agu 17, 2015 tarafından Yury Selivanov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

inspect.rst Doc/library/inspect.rst +4 -3

No files found.
--- 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])