diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-02-04 15:12:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-02-04 15:12:18 (GMT) |
| commit | e9e89076474f50a120ddbc554b8e517420e47e33 (patch) | |
| tree | bd6841333526cfcf82c5aa219d9e7f519802f46e | |
| parent | 6edd82a1d25bb941ebb5f5e98690ddc2ddbbd79e (diff) | |
| parent | 091d017ab11b42a542711ede2b171e432a0394b9 (diff) | |
| download | cpython-e9e89076474f50a120ddbc554b8e517420e47e33.zip cpython-e9e89076474f50a120ddbc554b8e517420e47e33.tar.gz cpython-e9e89076474f50a120ddbc554b8e517420e47e33.tar.bz2 | |
merge 3.3 (#19186)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/expat/expat_external.h | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -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. diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h index 2c03284..f337e1c 100644 --- 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 |