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

(cherry picked from commit 8ae8e6af37f29163ee263e293570cb892dc5b5d5)

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

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index c08986f6c0a56a22263e34b30d99f1b5b1b66efd..11a5c54696434a9994b4b82ae23388902dde5bfd 100644 (file)
--- 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 6ebd0706d025b52f56f3ec04eca41cc92f5ef2da..88146dc7bcb85d25abc9e379099bb3a4a6d1dc93 100644 (file)
--- 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
 --------------------