From: Berker Peksag Date: Mon, 2 Jan 2017 03:01:07 +0000 (+0300) Subject: Issue #29012: Merge from 3.5 X-Git-Tag: v3.6.1rc1~225 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a22457ecaff3e5c37f383b68449c9ca61368a6be;p=python Issue #29012: Merge from 3.5 --- a22457ecaff3e5c37f383b68449c9ca61368a6be diff --cc Doc/reference/datamodel.rst index f2a2b12b9f,2f5625b452..aa03477fb8 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@@ -788,12 -765,9 +788,12 @@@ 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 empty or a singleton) containing the base classes, in the + 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. + 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::