cpython: 9a0d367b8dd3 (original) (raw)

Mercurial > cpython

changeset 98769:9a0d367b8dd3

Merge for issue #25407 [#25407]

Brett Cannon brett@python.org
date	Fri, 16 Oct 2015 12:09:56 -0700
parents	0aaadc1c60fd(current diff)bcee1364e2dc(diff)
children	5877c191b76e
files	Misc/NEWS
diffstat	3 files changed, 7 insertions(+), 5 deletions(-)[+] [-] Doc/library/formatter.rst 5 Lib/formatter.py 4 Misc/NEWS 3

line wrap: on

line diff

--- 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

--- a/Lib/formatter.py +++ b/Lib/formatter.py @@ -20,8 +20,8 @@ manage and inserting data into the outpu import sys import warnings -warnings.warn('the formatter module is deprecated and will be removed in '

         'Python 3.6', DeprecationWarning, stacklevel=2)[](#l2.8)

+warnings.warn('the formatter module is deprecated', DeprecationWarning,

```
         stacklevel=2)[](#l2.10)
```

AS_IS = None

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -63,6 +63,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.