[Python-checkins] cpython (2.7): Issue #12501: merge the discordant NEWS entries.

Tue Jan 24 21:05:54 CET 2012

http://hg.python.org/cpython/rev/62bd0553693f
changeset: 74599:62bd0553693f
branch: 2.7
user: Florent Xicluna <florent.xicluna at gmail.com>
date: Tue Jan 24 21:05:10 2012 +0100
summary:
 Issue #12501: merge the discordant NEWS entries.
files:
 Misc/NEWS | 6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,8 +25,6 @@
 - Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder
 already accepts them).
 
-- Remove Py3k warning for callable.
-
 - Issue #10519: Avoid unnecessary recursive function calls in
 setobject.c.
 
@@ -73,8 +71,8 @@
 deallocator calls one of the methods on the type (e.g. when subclassing
 IOBase). Diagnosis and patch by Davide Rizzo.
 
-- Issue #12501: Adjust callable() warning: callable() is only not supported in
- Python 3.1. callable() is again supported in Python 3.2.
+- Issue #12501: Remove Py3k warning for callable. callable() is supported
+ again in Python 3.2.
 
 - Issue #9611, #9015: FileIO.read(), FileIO.readinto(), FileIO.write() and
 os.write() clamp the length to INT_MAX on Windows.
-- 
Repository URL: http://hg.python.org/cpython
