From: Berker Peksag Date: Tue, 3 Jan 2017 00:35:49 +0000 (+0300) Subject: Issue #29012: Merge from 3.5 X-Git-Tag: v3.6.1rc1~217 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=406c252970545211b28edf9daa69ceea105014b1;p=python Issue #29012: Merge from 3.5 --- 406c252970545211b28edf9daa69ceea105014b1 diff --cc Doc/reference/datamodel.rst index aa03477fb8,cd28c147b2..095a2380b3 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@@ -788,12 -765,9 +788,11 @@@ Custom classe 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 dictionary containing the class's namespace; :attr:`~class.__bases__` is a - tuple (possibly a singleton) containing the base classes, in the - order of their occurrence in the base class list; :attr:`__doc__` is the - class's documentation string, or ``None`` if undefined; - :attr:`__annotations__` (optional) is a dictionary containing - :term:`variable annotations ` collected during + tuple containing the base classes, in the order of their occurrence in the - base class list; :attr:`__doc__` is the class's documentation string, or - ``None`` if undefined. ++ base class list; :attr:`__doc__` is the class's documentation string, ++ or ``None`` if undefined; :attr:`__annotations__` (optional) is a dictionary ++ containing :term:`variable annotations ` collected during + class body execution. Class instances .. index::