summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:11:06 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:11:06 (GMT)
commitffc235cbbf66b3859af1a88d52d52349c6592130 (patch)
treeb8ada4219a221b5714d94b52e01a0500d826a07f /Misc
parent8b7664d0b81b65acf1e1946adf22d72cfa2dff26 (diff)
parent24befa87dcddd95005c82a1c42553856de7dcd08 (diff)
downloadcpython-ffc235cbbf66b3859af1a88d52d52349c6592130.zip
cpython-ffc235cbbf66b3859af1a88d52d52349c6592130.tar.gz
cpython-ffc235cbbf66b3859af1a88d52d52349c6592130.tar.bz2
merge with 3.2
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2d56431..a3de216 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,8 @@ Core and Builtins
Library
-------
+- Issue #12002: ftplib's abort() method raises TypeError.
+
- Issue 11916: Add a number of MacOSX specific definitions to the errno module.
Patch by Pierre Carrier.