[Python-checkins] cpython (merge 3.4 -> 3.5): Issue 22357: Merge from 3.4
yury.selivanov
python-checkins at python.org
Sat May 30 19:54:59 CEST 2015
https://hg.python.org/cpython/rev/1d9131bc0ea4
changeset: 96391:1d9131bc0ea4
branch: 3.5
parent: 96387:faea7c8bcb13
parent: 96390:943fa0e8b6a4
user: Yury Selivanov <yselivanov at sprymix.com>
date: Sat May 30 13:54:36 2015 -0400
summary:
Issue 22357: Merge from 3.4
files:
Doc/library/inspect.rst | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -43,6 +43,11 @@
+-----------+-----------------+---------------------------+
| class | __doc__ | documentation string |
+-----------+-----------------+---------------------------+
+| | __name__ | name with which this |
+| | | class was defined |
++-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __module__ | name of module in which |
| | | this class was defined |
+-----------+-----------------+---------------------------+
@@ -51,6 +56,8 @@
| | __name__ | name with which this |
| | | method was defined |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __func__ | function object |
| | | containing implementation |
| | | of method |
@@ -64,6 +71,8 @@
| | __name__ | name with which this |
| | | function was defined |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __code__ | code object containing |
| | | compiled function |
| | | :term:`bytecode` |
@@ -174,6 +183,8 @@
| | __name__ | original name of this |
| | | function or method |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __self__ | instance to which a |
| | | method is bound, or |
| | | ``None`` |
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list