[Python-checkins] cpython (3.1): Add back Misc/NEWS entry that got lost during merge, and fix a couple of other

[ezio.melotti]

http://hg.python.org/cpython/rev/bdc68fc8d3c9
changeset:   69937:bdc68fc8d3c9
branch:      3.1
parent:      69926:7884783c9145
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun May 08 19:58:08 2011 +0300
summary:
  Add back Misc/NEWS entry that got lost during merge, and fix a couple of other things.

files:
  Misc/NEWS |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -69,7 +69,9 @@
 - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
   by Kasun Herath.
 
-- Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
+- Issue #12002: ftplib's abort() method raises TypeError.
+
+- 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.
 
@@ -314,8 +316,8 @@
 - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
   IP addresses in the proxy exception list.
 
-Extensions
-----------
+Extension Modules
+-----------------
 
 - Issue #12017: Fix segfault in json.loads() while decoding highly-nested
   objects using the C accelerations.

-- 
Repository URL: http://hg.python.org/cpython