From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 4 Feb 2014 15:12:18 +0000 (-0500)
Subject: merge 3.3 (#19186)
X-Git-Tag: v3.4.0rc1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9e89076474f50a120ddbc554b8e517420e47e33;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19186)
---

e9e89076474f50a120ddbc554b8e517420e47e33
diff --cc Misc/NEWS
index 4f4243c9d51f,045be47951c6..0bf92fd62952
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,9 -45,8 +24,11 @@@ Core and Builtin
  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.
 +
  - Issue #20426: When passing the re.DEBUG flag, re.compile() displays the
    debug output every time it is called, regardless of the compilation cache.