From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 8 Oct 2014 18:02:40 +0000 (+0200)
Subject: Issue #22462: Fix pyexpat's creation of a dummy frame to make it appear in exception... 
X-Git-Tag: v3.5.0a1~733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94262ebc9c1249c1fdec771a48e9f666c37cfcde;p=python

Issue #22462: Fix pyexpat's creation of a dummy frame to make it appear in exception tracebacks.

Initial patch by Mark Shannon.
---

94262ebc9c1249c1fdec771a48e9f666c37cfcde
diff --cc Misc/NEWS
index af359c1055,4fe01097cd..08de2029aa
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -166,9 -24,9 +166,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22462: Fix pyexpat's creation of a dummy frame to make it
+   appear in exception tracebacks.
+ 
 +- Issue #21965: Add support for in-memory SSL to the ssl module.  Patch
 +  by Geert Jansen.
 +
  - Issue #21173: Fix len() on a WeakKeyDictionary when .clear() was called
    with an iterator alive.
  
diff --cc Modules/pyexpat.c
index 88984e705c,4ced53b611..3f34e63901
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@@ -6,17 -6,8 +6,15 @@@
  
  #include "pyexpat.h"
  
 +/* Do not emit Clinic output to a file as that wreaks havoc with conditionally
 +   included methods. */
 +/*[clinic input]
 +module pyexpat
 +[clinic start generated code]*/
 +/*[clinic end generated code: output=da39a3ee5e6b4b0d input=b168d503a4490c15]*/
 +
  #define XML_COMBINED_VERSION (10000*XML_MAJOR_VERSION+100*XML_MINOR_VERSION+XML_MICRO_VERSION)
  
- #define FIX_TRACE
- 
  static XML_Memory_Handling_Suite ExpatMemoryHandler = {
      PyObject_Malloc, PyObject_Realloc, PyObject_Free};