merge with 3.2

diff --cc Lib/ftplib.py
Simple merge

diff --cc Lib/test/test_ftplib.py
Simple merge

diff --cc Misc/NEWS
index 2d56431366b64fbe969c80e4455bd8ccc243db8e,22a3a67560de74de17c18169892faf7ad34276f0..a3de216ff7d37f074b069a57701b69e7627659b1
--- 1/Misc/NEWS
--- 2/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.