Issue #29012: Merge from 3.6

This commit is contained in:
Berker Peksag 2017-01-03 03:36:15 +03:00
commit c9c760d6ec

View file

@ -788,11 +788,10 @@ Custom classes
Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is Special attributes: :attr:`~definition.__name__` is the class name; :attr:`__module__` is
the module name in which the class was defined; :attr:`~object.__dict__` is the the module name in which the class was defined; :attr:`~object.__dict__` is the
dictionary containing the class's namespace; :attr:`~class.__bases__` is a dictionary containing the class's namespace; :attr:`~class.__bases__` is a
tuple (possibly a singleton) containing the base classes, in the tuple containing the base classes, in the order of their occurrence in the
order of their occurrence in the base class list; :attr:`__doc__` is the base class list; :attr:`__doc__` is the class's documentation string,
class's documentation string, or ``None`` if undefined; or ``None`` if undefined; :attr:`__annotations__` (optional) is a dictionary
:attr:`__annotations__` (optional) is a dictionary containing containing :term:`variable annotations <variable annotation>` collected during
:term:`variable annotations <variable annotation>` collected during
class body execution. class body execution.
Class instances Class instances