[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5
yury.selivanov
python-checkins at python.org
Mon Aug 17 19:15:40 CEST 2015
https://hg.python.org/cpython/rev/4610368e558a
changeset: 97419:4610368e558a
parent: 97417:04dfdde6eb18
parent: 97418:caa2d561e9dc
user: Yury Selivanov <yselivanov at sprymix.com>
date: Mon Aug 17 13:02:53 2015 -0400
summary:
Merge 3.5
files:
Doc/library/inspect.rst | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -178,6 +178,10 @@
+-----------+-----------------+---------------------------+
| | gi_code | code |
+-----------+-----------------+---------------------------+
+| | gi_yieldfrom | object being iterated by |
+| | | ``yield from``, or |
+| | | ``None`` |
++-----------+-----------------+---------------------------+
| coroutine | __name__ | name |
+-----------+-----------------+---------------------------+
| | __qualname__ | qualified name |
@@ -191,10 +195,6 @@
+-----------+-----------------+---------------------------+
| | cr_code | code |
+-----------+-----------------+---------------------------+
-| | gi_yieldfrom | object being iterated by |
-| | | ``yield from``, or |
-| | | ``None`` |
-+-----------+-----------------+---------------------------+
| builtin | __doc__ | documentation string |
+-----------+-----------------+---------------------------+
| | __name__ | original name of this |
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list