diff options
| author | Eli Bendersky <eliben@gmail.com> | 2012-06-01 06:48:37 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2012-06-01 06:48:37 (GMT) |
| commit | 20d4174b3d211609c774bd0711dcbc1793f146aa (patch) | |
| tree | 6b3fd4fae7c413283ed18f1f193f10836e0a2927 | |
| parent | 2e185e17ced26cb588a8ebeed9f099a1a02e9444 (diff) | |
| download | cpython-20d4174b3d211609c774bd0711dcbc1793f146aa.zip cpython-20d4174b3d211609c774bd0711dcbc1793f146aa.tar.gz cpython-20d4174b3d211609c774bd0711dcbc1793f146aa.tar.bz2 | |
We're always building _elementtree with USE_PYEXPAT_CAPI, so the #ifdefs in
the code are unnecessary.
| -rw-r--r-- | Modules/_elementtree.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index f2a1e64..7bc1880 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -58,9 +58,6 @@ /* Leave defined to include the expat-based XMLParser type */ #define USE_EXPAT -/* Define to do all expat calls via pyexpat's embedded expat library */ -/* #define USE_PYEXPAT_CAPI */ - /* An element can hold this many children without extra memory allocations. */ #define STATIC_CHILDREN 4 @@ -2248,14 +2245,9 @@ static PyTypeObject TreeBuilder_Type = { #if defined(USE_EXPAT) #include "expat.h" - -#if defined(USE_PYEXPAT_CAPI) #include "pyexpat.h" -static struct PyExpat_CAPI* expat_capi; +static struct PyExpat_CAPI *expat_capi; #define EXPAT(func) (expat_capi->func) -#else -#define EXPAT(func) (XML_##func) -#endif static XML_Memory_Handling_Suite ExpatMemoryHandler = { PyObject_Malloc, PyObject_Realloc, PyObject_Free}; @@ -3223,8 +3215,7 @@ PyInit__elementtree(void) elementtree_iter_obj = PyDict_GetItemString(g, "iter"); elementtree_itertext_obj = PyDict_GetItemString(g, "itertext"); -#if defined(USE_PYEXPAT_CAPI) - /* link against pyexpat, if possible */ + /* link against pyexpat */ expat_capi = PyCapsule_Import(PyExpat_CAPSULE_NAME, 0); if (expat_capi) { /* check that it's usable */ @@ -3242,7 +3233,6 @@ PyInit__elementtree(void) ); return NULL; } -#endif elementtree_parseerror_obj = PyErr_NewException( "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL |