[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #25407

[brett.cannon]

https://hg.python.org/cpython/rev/9a0d367b8dd3
changeset:   98769:9a0d367b8dd3
parent:      98767:0aaadc1c60fd
parent:      98768:bcee1364e2dc
user:        Brett Cannon <brett at python.org>
date:        Fri Oct 16 12:09:56 2015 -0700
summary:
  Merge for issue #25407

files:
  Doc/library/formatter.rst |  5 ++---
  Lib/formatter.py          |  4 ++--
  Misc/NEWS                 |  3 +++
  3 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Doc/library/formatter.rst b/Doc/library/formatter.rst
--- 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
--- 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
--- 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.

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