summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-01-24 20:05:10 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-01-24 20:05:10 (GMT)
commita1f948bdec94e1c512bb42c178062c14963a77f4 (patch)
tree19a525bac2b914412e1d02c64f5d0bd6299cdcf3 /Misc
parentd1c818a9c0a3684f57d7d00c6ec43763783ccf2a (diff)
downloadcpython-a1f948bdec94e1c512bb42c178062c14963a77f4.zip
cpython-a1f948bdec94e1c512bb42c178062c14963a77f4.tar.gz
cpython-a1f948bdec94e1c512bb42c178062c14963a77f4.tar.bz2
Issue #12501: merge the discordant NEWS entries.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS6
1 files changed, 2 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 6f910be..5613ea5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,8 +25,6 @@ Core and Builtins
- 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 @@ Core and Builtins
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.