[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19186)

[benjamin.peterson]

http://hg.python.org/cpython/rev/a2d877fb53f6
changeset:   88957:a2d877fb53f6
parent:      88955:1b8ba1346e67
parent:      88956:c242a8f30806
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Feb 04 10:12:18 2014 -0500
summary:
  merge 3.3 (#19186)

files:
  Misc/NEWS                      |  2 ++
  Modules/expat/expat_external.h |  4 ++++
  2 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@
 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.
 
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
--- 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

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