From 5ad5a7d31f5328c73df523b6ade330d88573717e Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 16 Oct 2015 12:09:33 -0700 Subject: [PATCH] Issue #25407: Drop the mention of the formatter module being removed in Python 3.6. The new PEP 4 policy of any module existing in both 2.7 and 3.5 applies here, hence the module will be with us for a bit longer. --- 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 index a515f74f64..8e8e201ae1 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 5e8e2ff377..e2394de8c2 100644 --- a/Lib/formatter.py +++ b/Lib/formatter.py @@ -20,8 +20,8 @@ manage and inserting data into the output. 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 232917a4c1..3c94e4a882 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,9 @@ Core and Builtins 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. -- 2.50.1