Merge 3.5

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

Showing with 4 additions and 4 deletions

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

No files found.
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -178,6 +178,10 @@ attributes:
 +-----------+-----------------+---------------------------+
 |           | gi_code         | code                      |
 +-----------+-----------------+---------------------------+
+|           | gi_yieldfrom    | object being iterated by  |
+|           |                 | ``yield from``, or        |
+|           |                 | ``None``                  |
+-----------+-----------------+---------------------------+
 | coroutine | __name__        | name                      |
 +-----------+-----------------+---------------------------+
 |           | __qualname__    | qualified name            |
@@ -191,10 +195,6 @@ attributes:
 +-----------+-----------------+---------------------------+
 |           | cr_code         | code                      |
 +-----------+-----------------+---------------------------+
-|           | gi_yieldfrom    | object being iterated by  |
-|           |                 | ``yield from``, or        |
-|           |                 | ``None``                  |
-+-----------+-----------------+---------------------------+
 | builtin   | __doc__         | documentation string      |
 +-----------+-----------------+---------------------------+
 |           | __name__        | original name of this     |