Issue 22357: Merge from 3.4

This commit is contained in:
Yury Selivanov 2015-05-30 13:54:36 -04:00
commit 582b8c7629
1 changed files with 11 additions and 0 deletions

View File

@ -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`` |