From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Sat, 7 May 2011 17:11:06 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~2364^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffc235cbbf66b3859af1a88d52d52349c6592130;p=python

merge with 3.2
---

ffc235cbbf66b3859af1a88d52d52349c6592130
diff --cc Misc/NEWS
index 2d56431366,22a3a67560..a3de216ff7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -83,8 +140,11 @@@ Core and Builtin
  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.
 +
  - Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
    detect mtime changes by comparing to the system clock instead of to the
    previous value of the mtime.