diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2017-01-03 00:35:49 (GMT) |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2017-01-03 00:35:49 (GMT) |
commit | 406c252970545211b28edf9daa69ceea105014b1 (patch) | |
tree | 83d46a0488ca656d99539942f68d589c0a1a335b | |
parent | 2eb97231b82510f41092b7569fd8e9c8723543a7 (diff) | |
parent | 7b4e55109100d1069e8176d6a84c48ec928f72ad (diff) | |
download | cpython-406c252970545211b28edf9daa69ceea105014b1.zip cpython-406c252970545211b28edf9daa69ceea105014b1.tar.gz cpython-406c252970545211b28edf9daa69ceea105014b1.tar.bz2 |
Issue #29012: Merge from 3.5
-rw-r--r-- | Doc/reference/datamodel.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index aa03477..095a238 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -788,11 +788,10 @@ Custom classes 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 <variable annotation>` 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; :attr:`__annotations__` (optional) is a dictionary + containing :term:`variable annotations <variable annotation>` collected during class body execution. Class instances |