[Python-checkins] bpo-23722: Fix docs for future __classcell__ changes. (GH-6999)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/10a122c0d55b01b053126ef3fd4d9e05ab8f2372
commit: 10a122c0d55b01b053126ef3fd4d9e05ab8f2372
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-05-19T22:47:05-07:00
summary:

bpo-23722: Fix docs for future __classcell__ changes. (GH-6999)

(cherry picked from commit 8ae8e6af37f29163ee263e293570cb892dc5b5d5)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Doc/reference/datamodel.rst
M Doc/whatsnew/3.6.rst

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index c08986f6c0a5..11a5c5469643 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1887,7 +1887,7 @@ current call is identified based on the first argument passed to the method.
    be propagated up to the ``type.__new__`` call in order for the class to be
    initialised correctly.
    Failing to do so will result in a :exc:`DeprecationWarning` in Python 3.6,
-   and a :exc:`RuntimeWarning` in the future.
+   and a :exc:`RuntimeError` in Python 3.8.
 
 When using the default metaclass :class:`type`, or any metaclass that ultimately
 calls ``type.__new__``, the following additional customisation steps are
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 6ebd0706d025..88146dc7bcb8 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -2270,7 +2270,8 @@ Changes in the Python API
   direct references from methods to the implicit ``__class__`` closure
   variable, the implicit ``__classcell__`` namespace entry must now be passed
   up to ``type.__new__`` for initialisation. Failing to do so will result in
-  a :exc:`DeprecationWarning` in 3.6 and a :exc:`RuntimeWarning` in the future.
+  a :exc:`DeprecationWarning` in Python 3.6 and a :exc:`RuntimeError` in
+  Python 3.8.
 
 Changes in the C API
 --------------------