cpython: 7f17c67b5bf6 (original) (raw)

Mercurial > cpython

changeset 84500:7f17c67b5bf6

Issue #18227: pyexpat now uses a static XML_Memory_Handling_Suite. cElementTree uses the same approach since at least Python 2.6 [#18227]

Christian Heimes christian@cheimes.de
date	Sun, 07 Jul 2013 17:35:11 +0200
parents	10db0c67fc72
children	31a635303e55
files	Modules/pyexpat.c
diffstat	1 files changed, 6 insertions(+), 6 deletions(-)[+] [-] Modules/pyexpat.c 12

line wrap: on

line diff

--- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -10,6 +10,9 @@ #define FIX_TRACE +static XML_Memory_Handling_Suite ExpatMemoryHandler = {

PyObject_Malloc, PyObject_Realloc, PyObject_Free};

+ enum HandlerTypes { StartElement, EndElement, @@ -1177,12 +1180,9 @@ newxmlparseobject(char *encoding, char * self->in_callback = 0; self->ns_prefixes = 0; self->handlers = NULL;

if (namespace_separator != NULL) {

   self->itself = XML_ParserCreateNS(encoding, *namespace_separator);[](#l1.18)

}
else {

   self->itself = XML_ParserCreate(encoding);[](#l1.21)

}

/* namespace_separator is either NULL or contains one char + \0 */
self->itself = XML_ParserCreate_MM(encoding, &ExpatMemoryHandler,

                                  namespace_separator);[](#l1.25)

#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) || defined(XML_HAS_SET_HASH_SALT) /* This feature was added upstream in libexpat 2.1.0. Our expat copy * has a backport of this feature where we also define XML_HAS_SET_HASH_SALT