[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29012: Merge from 3.5
berker.peksag
python-checkins at python.org
Sun Jan 1 21:59:02 EST 2017
https://hg.python.org/cpython/rev/019125fb6d66
changeset: 105930:019125fb6d66
branch: 3.6
parent: 105927:5698d84d0187
parent: 105929:721df314d45a
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Jan 02 06:01:07 2017 +0300
summary:
Issue #29012: Merge from 3.5
files:
Doc/reference/datamodel.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -788,7 +788,7 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list