[Python-checkins] cpython (merge 3.5 -> 3.5): merge

[eric.snow]

https://hg.python.org/cpython/rev/9d779c04b009
changeset:   96395:9d779c04b009
branch:      3.5
parent:      96394:951a3ef82180
parent:      96391:1d9131bc0ea4
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Sat May 30 11:59:17 2015 -0600
summary:
  merge

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