From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 14 Mar 2014 01:34:54 +0000 (-0400)
Subject: whatsnew: difflib.isbjunk &c were removed, not deprecated.
X-Git-Tag: v3.4.0~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dfc632f1f8407079d728bc71c10704d078662e2;p=thirdparty%2FPython%2Fcpython.git

whatsnew: difflib.isbjunk &c were removed, not deprecated.

Also move NEWS item to correct position (it was in 3.3).
---

diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 1bda6fa0fcb7..939d491ed8eb 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1503,10 +1503,6 @@ using ``-Wd``).
 Deprecated Python Modules, Functions and Methods
 ------------------------------------------------
 
-* :meth:`difflib.SequenceMatcher.isbjunk` and
-  :meth:`difflib.SequenceMatcher.isbpopular` were removed: use ``x in sm.bjunk`` and
-  ``x in sm.bpopular``, where *sm* is a :class:`~difflib.SequenceMatcher` object.
-
 * As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importilb`
   methods and functions are deprecated: :meth:`importlib.find_loader` is
   replaced by :func:`importlib.util.find_spec`;
@@ -1612,6 +1608,12 @@ removed:
 * :class:`inspect.Signature`: positional-only parameters are now required
   to have a valid name.
 
+* :meth:`difflib.SequenceMatcher.isbjunk` and
+  :meth:`difflib.SequenceMatcher.isbpopular` were deprecated in 3.2, and have
+  now been removed: use ``x in sm.bjunk`` and
+  ``x in sm.bpopular``, where *sm* is a :class:`~difflib.SequenceMatcher` object
+  (:issue:`13248`).
+
 
 Code Cleanups
 -------------
diff --git a/Misc/NEWS b/Misc/NEWS
index 3c6540a77a5e..39b11977d880 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2987,6 +2987,9 @@ Library
 - Issue #17467: add readline and readlines support to mock_open in
   unittest.mock.
 
+- Issue #13248: removed deprecated and undocumented difflib.isbjunk,
+  isbpopular.
+
 - Issue #17192: Update the ctypes module's libffi to v3.0.13.  This
   specifically addresses a stack misalignment issue on x86 and issues on
   some more recent platforms.
@@ -4412,8 +4415,6 @@ Core and Builtins
 Library
 -------
 
-- Issue #13248: removed deprecated and undocumented difflib.isbjunk, isbpopular.
-
 - Issue #13370: Ensure that ctypes works on Mac OS X when Python is compiled
   using the clang compiler.