]> granicus.if.org Git - python/commitdiff
Issue #22462: Fix pyexpat's creation of a dummy frame to make it appear in exception...
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 8 Oct 2014 18:02:40 +0000 (20:02 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 8 Oct 2014 18:02:40 +0000 (20:02 +0200)
Initial patch by Mark Shannon.

1  2 
Misc/NEWS
Modules/_ctypes/callproc.c
Modules/pyexpat.c
Python/traceback.c

diff --cc Misc/NEWS
index af359c105599f511db3c991f08c77e968dbffa9b,4fe01097cd21accb15bcb7de8fb9e4e53d1b55f6..08de2029aa3983464ce9f79f24240f6379f58d47
+++ 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.
  
Simple merge
index 88984e705c21aad42694b17e17ec9b76eaf378f0,4ced53b611aebea3215262ea11cc835e77925c50..3f34e63901d194a6ed8fa331c2a65dd69e8302b9
@@@ -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};
  
Simple merge