summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-05-30 13:54:36 -0400
committerYury Selivanov <yselivanov@sprymix.com>2015-05-30 13:54:36 -0400
commit582b8c7629cda2bd8b0b445ea3a896a0aaea78eb (patch)
tree7d013322253d18af5ddbf72d2229fa67a28c8b46
parent1b560cbf850fc1c8165b3505c4a137de0abf3668 (diff)
parent03395687532243d3aae9b7a56a344080dcb959a4 (diff)
downloadcpython-git-582b8c7629cda2bd8b0b445ea3a896a0aaea78eb.tar.gz
Issue 22357: Merge from 3.4
-rw-r--r--Doc/library/inspect.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 2eefcf2f70..98b7cb77a7 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -43,6 +43,11 @@ attributes:
+-----------+-----------------+---------------------------+
| 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 @@ attributes:
| | __name__ | name with which this |
| | | method was defined |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __func__ | function object |
| | | containing implementation |
| | | of method |
@@ -64,6 +71,8 @@ attributes:
| | __name__ | name with which this |
| | | function was defined |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __code__ | code object containing |
| | | compiled function |
| | | :term:`bytecode` |
@@ -174,6 +183,8 @@ attributes:
| | __name__ | original name of this |
| | | function or method |
+-----------+-----------------+---------------------------+
+| | __qualname__ | qualified name |
++-----------+-----------------+---------------------------+
| | __self__ | instance to which a |
| | | method is bound, or |
| | | ``None`` |