merge 3.3 (#19186)

2014-02-04 10:12:18 -05:00 · 2014-02-04 10:12:18 -05:00 · e9e8907647
parent 6edd82a1d2 091d017ab1
commit e9e8907647
2 changed files with 6 additions and 0 deletions
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -24,6 +24,8 @@ Core and Builtins
 Library
 -------

+- Issue #19186: Restore namespacing of expat symbols inside the pyexpat module.
+
 - Issue #20053: ensurepip (and hence venv) are no longer affected by the
  settings in the default pip configuration file.

--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@ -7,6 +7,10 @@

 /* External API definitions */

+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
 #define XML_USE_MSC_EXTENSIONS 1
 #endif