summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2017-01-02 03:01:07 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2017-01-02 03:01:07 (GMT)
commita22457ecaff3e5c37f383b68449c9ca61368a6be (patch)
tree3c8a3744bd80072eb7f655d05e1aa921294c6ef8 /Doc
parent2a267a12ee3620a86f684a5417a9e8792856ae48 (diff)
parent14adafd6eec3b68d11e147c77dab37ad5962fcd6 (diff)
downloadcpython-a22457ecaff3e5c37f383b68449c9ca61368a6be.zip
cpython-a22457ecaff3e5c37f383b68449c9ca61368a6be.tar.gz
cpython-a22457ecaff3e5c37f383b68449c9ca61368a6be.tar.bz2
Issue #29012: Merge from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index f2a2b12..aa03477 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -788,7 +788,7 @@ 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 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;
:attr:`__annotations__` (optional) is a dictionary containing