[Python-checkins] cpython (merge 3.6 -> default): Issue #29012: Merge from 3.6

[berker.peksag]

https://hg.python.org/cpython/rev/f05165a9cae6
changeset:   105967:f05165a9cae6
parent:      105964:2d705c883872
parent:      105966:7ef5b02b228a
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Jan 03 03:36:15 2017 +0300
summary:
  Issue #29012: Merge from 3.6

files:
  Doc/reference/datamodel.rst |  9 ++++-----
  1 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -788,11 +788,10 @@
    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

-- 
Repository URL: https://hg.python.org/cpython