Merge for issue #25407
diff --git a/Doc/library/formatter.rst b/Doc/library/formatter.rst
index a515f74..8e8e201 100644
--- a/Doc/library/formatter.rst
+++ b/Doc/library/formatter.rst
@@ -5,9 +5,8 @@
:synopsis: Generic output formatter and device interface.
:deprecated:
-.. deprecated-removed:: 3.4 3.6
- Due to lack of usage, the formatter module has been deprecated and is slated
- for removal in Python 3.6.
+.. deprecated:: 3.4
+ Due to lack of usage, the formatter module has been deprecated.
This module supports two interface definitions, each with multiple
diff --git a/Lib/formatter.py b/Lib/formatter.py
index 5e8e2ff..e2394de 100644
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -20,8 +20,8 @@
import sys
import warnings
-warnings.warn('the formatter module is deprecated and will be removed in '
- 'Python 3.6', DeprecationWarning, stacklevel=2)
+warnings.warn('the formatter module is deprecated', DeprecationWarning,
+ stacklevel=2)
AS_IS = None
diff --git a/Misc/NEWS b/Misc/NEWS
index 5e102da..bcc85a7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -63,6 +63,9 @@
Library
-------
+- Issue #25407: Remove mentions of the formatter module being removed in
+ Python 3.6.
+
- Issue #25406: Fixed a bug in C implementation of OrderedDict.move_to_end()
that caused segmentation fault or hang in iterating after moving several
items to the start of ordered dict.