Skip to content

Commit aa15ea4

Browse files
committed
Merge for issue #25407
2 parents 83356f7 + 5ad5a7d commit aa15ea4

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Doc/library/formatter.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
:synopsis: Generic output formatter and device interface.
66
:deprecated:
77

8-
.. deprecated-removed:: 3.4 3.6
9-
Due to lack of usage, the formatter module has been deprecated and is slated
10-
for removal in Python 3.6.
8+
.. deprecated:: 3.4
9+
Due to lack of usage, the formatter module has been deprecated.
1110

1211

1312
This module supports two interface definitions, each with multiple

Lib/formatter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import sys
2222
import warnings
23-
warnings.warn('the formatter module is deprecated and will be removed in '
24-
'Python 3.6', DeprecationWarning, stacklevel=2)
23+
warnings.warn('the formatter module is deprecated', DeprecationWarning,
24+
stacklevel=2)
2525

2626

2727
AS_IS = None

Misc/NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ Core and Builtins
6363
Library
6464
-------
6565

66+
- Issue #25407: Remove mentions of the formatter module being removed in
67+
Python 3.6.
68+
6669
- Issue #25406: Fixed a bug in C implementation of OrderedDict.move_to_end()
6770
that caused segmentation fault or hang in iterating after moving several
6871
items to the start of ordered dict.

0 commit comments

Comments
 (0)