From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 May 2011 06:12:19 +0000 (+0200)
Subject: merge 11164
X-Git-Tag: v3.3.0a1~2347
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c038b472675cf6e9ade17cf0ab9f3c8b5250f90;p=python

merge 11164
---

7c038b472675cf6e9ade17cf0ab9f3c8b5250f90
diff --cc Misc/NEWS
index eec84f7b37,6c942afba8..36a6cb5dba
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,18 -83,8 +140,20 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11164: Stop trying to use _xmlplus in the xml module.
+ 
 +- Issue #11888: Add log2 function to math module. Patch written by Mark
 +  Dickinson.
 +
 +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional.
 +
 +- Issue #8407: The signal handler writes the signal number as a single byte
 +  instead of a nul byte into the wakeup file descriptor. So it is possible to
 +  wait more than one signal and know which signals were raised.
 +
 +- Issue #8407: Add pthread_kill(), sigpending() and sigwait() functions to the
 +  signal module.
 +
  - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
    by Kasun Herath.