cpython-lru_cache-weakref: Modules/

annotate Modules/_elementtree.c @ 79005:2fa7c104f909

Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359

author	Christian Heimes <christian@cheimes.de>
date	Wed, 12 Sep 2012 15:32:06 +0200
parents	4b232f6d2ea3
children	99112b851b25

rev	line source
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1 /*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2 * ElementTree
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3 * $Id: _elementtree.c 3473 2009-01-11 22:53:55Z fredrik $
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	4 *
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	5 * elementtree accelerator
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	6 *
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	7 * History:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	8 * 1999-06-20 fl created (as part of sgmlop)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	9 * 2001-05-29 fl effdom edition
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	10 * 2003-02-27 fl elementtree edition (alpha)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	11 * 2004-06-03 fl updates for elementtree 1.2
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	12 * 2005-01-05 fl major optimization effort
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	13 * 2005-01-11 fl first public release (cElementTree 0.8)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	14 * 2005-01-12 fl split element object into base and extras
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	15 * 2005-01-13 fl use tagged pointers for tail/text (cElementTree 0.9)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	16 * 2005-01-17 fl added treebuilder close method
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	17 * 2005-01-17 fl fixed crash in getchildren
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	18 * 2005-01-18 fl removed observer api, added iterparse (cElementTree 0.9.3)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	19 * 2005-01-23 fl revised iterparse api; added namespace event support (0.9.8)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	20 * 2005-01-26 fl added VERSION module property (cElementTree 1.0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	21 * 2005-01-28 fl added remove method (1.0.1)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	22 * 2005-03-01 fl added iselement function; fixed makeelement aliasing (1.0.2)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	23 * 2005-03-13 fl export Comment and ProcessingInstruction/PI helpers
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	24 * 2005-03-26 fl added Comment and PI support to XMLParser
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	25 * 2005-03-27 fl event optimizations; complain about bogus events
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	26 * 2005-08-08 fl fixed read error handling in parse
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	27 * 2005-08-11 fl added runtime test for copy workaround (1.0.3)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	28 * 2005-12-13 fl added expat_capi support (for xml.etree) (1.0.4)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	29 * 2005-12-16 fl added support for non-standard encodings
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	30 * 2006-03-08 fl fixed a couple of potential null-refs and leaks
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	31 * 2006-03-12 fl merge in 2.5 ssize_t changes
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	32 * 2007-08-25 fl call custom builder's close method from XMLParser
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	33 * 2007-08-31 fl added iter, extend from ET 1.3
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	34 * 2007-09-01 fl fixed ParseError exception, setslice source type, etc
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	35 * 2007-09-03 fl fixed handling of negative insert indexes
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	36 * 2007-09-04 fl added itertext from ET 1.3
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	37 * 2007-09-06 fl added position attribute to ParseError exception
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	38 * 2008-06-06 fl delay error reporting in iterparse (from Hrvoje Niksic)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	39 *
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	40 * Copyright (c) 1999-2009 by Secret Labs AB. All rights reserved.
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	41 * Copyright (c) 1999-2009 by Fredrik Lundh.
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	42 *
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	43 * info@pythonware.com
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	44 * http://www.pythonware.com
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	45 */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	46
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	47 /* Licensed to PSF under a Contributor Agreement. */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	48 /* See http://www.python.org/psf/license for licensing details. */
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	49
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	50 #include "Python.h"
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	51 #include "structmember.h"
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	52
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	53 #define VERSION "1.0.6"
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	54
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	55 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	56 /* configuration */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	57
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	58 /* Leave defined to include the expat-based XMLParser type */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	59 #define USE_EXPAT
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	60
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	61 /* An element can hold this many children without extra memory
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	62 allocations. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	63 #define STATIC_CHILDREN 4
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	64
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	65 /* For best performance, chose a value so that 80-90% of all nodes
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	66 have no more than the given number of children. Set this to zero
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	67 to minimize the size of the element structure itself (this only
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	68 helps if you have lots of leaf nodes with attributes). */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	69
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	70 /* Also note that pymalloc always allocates blocks in multiples of
74903 65fc79fb4eb2 Issue #13988: cElementTree is deprecated and the _elementtree accelerator is automatically used whenever available. Florent Xicluna <florent.xicluna@gmail.com> parents: 74870 diff changeset	71 eight bytes. For the current C version of ElementTree, this means
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	72 that the number of children should be an even number, at least on
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	73 32-bit platforms. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	74
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	75 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	76
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	77 #if 0
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	78 static int memory = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	79 #define ALLOC(size, comment)\
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	80 do { memory += size; printf("%8d - %s\n", memory, comment); } while (0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	81 #define RELEASE(size, comment)\
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	82 do { memory -= size; printf("%8d - %s\n", memory, comment); } while (0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	83 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	84 #define ALLOC(size, comment)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	85 #define RELEASE(size, comment)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	86 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	87
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	88 /* compiler tweaks */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	89 #if defined(_MSC_VER)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	90 #define LOCAL(type) static __inline type __fastcall
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	91 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	92 #define LOCAL(type) static type
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	93 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	94
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	95 /* macros used to store 'join' flags in string object pointers. note
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	96 that all use of text and tail as object pointers must be wrapped in
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	97 JOIN_OBJ. see comments in the ElementObject definition for more
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	98 info. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	99 #define JOIN_GET(p) ((Py_uintptr_t) (p) & 1)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	100 #define JOIN_SET(p, flag) ((void*) ((Py_uintptr_t) (JOIN_OBJ(p)) \| (flag)))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	101 #define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~1))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	102
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	103 /* glue functions (see the init function for details) */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	104 static PyObject* elementtree_parseerror_obj;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	105 static PyObject* elementtree_deepcopy_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	106 static PyObject* elementpath_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	107
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	108 /* helpers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	109
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	110 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	111 deepcopy(PyObject* object, PyObject* memo)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	112 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	113 /* do a deep copy of the given object */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	114
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	115 PyObject* args;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	116 PyObject* result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	117
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	118 if (!elementtree_deepcopy_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	119 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	120 PyExc_RuntimeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	121 "deepcopy helper not found"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	122 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	123 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	124 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	125
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	126 args = PyTuple_New(2);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	127 if (!args)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	128 return NULL;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	129
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	130 Py_INCREF(object); PyTuple_SET_ITEM(args, 0, (PyObject*) object);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	131 Py_INCREF(memo); PyTuple_SET_ITEM(args, 1, (PyObject*) memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	132
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	133 result = PyObject_CallObject(elementtree_deepcopy_obj, args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	134
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	135 Py_DECREF(args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	136
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	137 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	138 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	139
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	140 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	141 list_join(PyObject* list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	142 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	143 /* join list elements (destroying the list in the process) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	144
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	145 PyObject* joiner;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	146 PyObject* function;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	147 PyObject* args;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	148 PyObject* result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	149
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	150 switch (PyList_GET_SIZE(list)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	151 case 0:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	152 Py_DECREF(list);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	153 return PyBytes_FromString("");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	154 case 1:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	155 result = PyList_GET_ITEM(list, 0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	156 Py_INCREF(result);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	157 Py_DECREF(list);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	158 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	159 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	160
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	161 /* two or more elements: slice out a suitable separator from the
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	162 first member, and use that to join the entire list */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	163
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	164 joiner = PySequence_GetSlice(PyList_GET_ITEM(list, 0), 0, 0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	165 if (!joiner)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	166 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	167
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	168 function = PyObject_GetAttrString(joiner, "join");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	169 if (!function) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	170 Py_DECREF(joiner);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	171 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	172 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	173
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	174 args = PyTuple_New(1);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	175 if (!args)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	176 return NULL;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	177
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	178 PyTuple_SET_ITEM(args, 0, list);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	179
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	180 result = PyObject_CallObject(function, args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	181
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	182 Py_DECREF(args); /* also removes list */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	183 Py_DECREF(function);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	184 Py_DECREF(joiner);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	185
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	186 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	187 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	188
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	189 /* Is the given object an empty dictionary?
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	190 */
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	191 static int
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	192 is_empty_dict(PyObject *obj)
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	193 {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	194 return PyDict_CheckExact(obj) && PyDict_Size(obj) == 0;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	195 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	196
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	197
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	198 /* -------------------------------------------------------------------- */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	199 /* the Element type */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	200
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	201 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	202
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	203 /* attributes (a dictionary object), or None if no attributes */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	204 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	205
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	206 /* child elements */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	207 int length; /* actual number of items */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	208 int allocated; /* allocated items */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	209
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	210 /* this either points to _children or to a malloced buffer */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	211 PyObject* *children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	212
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	213 PyObject* _children[STATIC_CHILDREN];
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	214
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	215 } ElementObjectExtra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	216
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	217 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	218 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	219
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	220 /* element tag (a string). */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	221 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	222
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	223 /* text before first child. note that this is a tagged pointer;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	224 use JOIN_OBJ to get the object pointer. the join flag is used
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	225 to distinguish lists created by the tree builder from lists
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	226 assigned to the attribute by application code; the former
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	227 should be joined before being returned to the user, the latter
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	228 should be left intact. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	229 PyObject* text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	230
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	231 /* text after this element, in parent. note that this is a tagged
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	232 pointer; use JOIN_OBJ to get the object pointer. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	233 PyObject* tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	234
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	235 ElementObjectExtra* extra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	236
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	237 PyObject weakreflist; / For tp_weaklistoffset */
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	238
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	239 } ElementObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	240
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	241 static PyTypeObject Element_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	242
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	243 #define Element_CheckExact(op) (Py_TYPE(op) == &Element_Type)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	244
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	245 /* -------------------------------------------------------------------- */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	246 /* Element constructors and destructor */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	247
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	248 LOCAL(int)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	249 create_extra(ElementObject* self, PyObject* attrib)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	250 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	251 self->extra = PyObject_Malloc(sizeof(ElementObjectExtra));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	252 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	253 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	254
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	255 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	256 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	257
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	258 Py_INCREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	259 self->extra->attrib = attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	260
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	261 self->extra->length = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	262 self->extra->allocated = STATIC_CHILDREN;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	263 self->extra->children = self->extra->_children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	264
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	265 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	266 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	267
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	268 LOCAL(void)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	269 dealloc_extra(ElementObject* self)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	270 {
76101 118729090dc5 Fix Windows compilation errors Eli Bendersky <eliben@gmail.com> parents: 76098 diff changeset	271 ElementObjectExtra *myextra;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	272 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	273
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	274 if (!self->extra)
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	275 return;
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	276
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	277 /* Avoid DECREFs calling into this code again (cycles, etc.)
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	278 */
76101 118729090dc5 Fix Windows compilation errors Eli Bendersky <eliben@gmail.com> parents: 76098 diff changeset	279 myextra = self->extra;
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	280 self->extra = NULL;
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	281
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	282 Py_DECREF(myextra->attrib);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	283
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	284 for (i = 0; i < myextra->length; i++)
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	285 Py_DECREF(myextra->children[i]);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	286
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	287 if (myextra->children != myextra->_children)
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	288 PyObject_Free(myextra->children);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	289
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	290 PyObject_Free(myextra);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	291 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	292
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	293 /* Convenience internal function to create new Element objects with the given
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	294 * tag and attributes.
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	295 */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	296 LOCAL(PyObject*)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	297 create_new_element(PyObject* tag, PyObject* attrib)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	298 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	299 ElementObject* self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	300
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	301 self = PyObject_GC_New(ElementObject, &Element_Type);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	302 if (self == NULL)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	303 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	304 self->extra = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	305
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	306 if (attrib != Py_None && !is_empty_dict(attrib)) {
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	307 if (create_extra(self, attrib) < 0) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37144 diff changeset	308 PyObject_Del(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	309 return NULL;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	310 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	311 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	312
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	313 Py_INCREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	314 self->tag = tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	315
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	316 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	317 self->text = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	318
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	319 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	320 self->tail = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	321
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	322 self->weakreflist = NULL;
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	323
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	324 ALLOC(sizeof(ElementObject), "create element");
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	325 PyObject_GC_Track(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	326 return (PyObject*) self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	327 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	328
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	329 static PyObject *
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	330 element_new(PyTypeObject type, PyObject args, PyObject *kwds)
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	331 {
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	332 ElementObject e = (ElementObject )type->tp_alloc(type, 0);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	333 if (e != NULL) {
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	334 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	335 e->tag = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	336
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	337 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	338 e->text = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	339
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	340 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	341 e->tail = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	342
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	343 e->extra = NULL;
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	344 e->weakreflist = NULL;
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	345 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	346 return (PyObject *)e;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	347 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	348
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	349 /* Helper function for extracting the attrib dictionary from a keywords dict.
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	350 * This is required by some constructors/functions in this module that can
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	351 * either accept attrib as a keyword argument or all attributes splashed
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	352 * directly into *kwds.
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	353 * If there is no 'attrib' keyword, return an empty dict.
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	354 */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	355 static PyObject*
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	356 get_attrib_from_keywords(PyObject *kwds)
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	357 {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	358 PyObject *attrib_str = PyUnicode_FromString("attrib");
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	359 PyObject *attrib = PyDict_GetItem(kwds, attrib_str);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	360
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	361 if (attrib) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	362 /* If attrib was found in kwds, copy its value and remove it from
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	363 * kwds
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	364 */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	365 if (!PyDict_Check(attrib)) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	366 Py_DECREF(attrib_str);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	367 PyErr_Format(PyExc_TypeError, "attrib must be dict, not %.100s",
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	368 Py_TYPE(attrib)->tp_name);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	369 return NULL;
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	370 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	371 attrib = PyDict_Copy(attrib);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	372 PyDict_DelItem(kwds, attrib_str);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	373 } else {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	374 attrib = PyDict_New();
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	375 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	376
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	377 Py_DECREF(attrib_str);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	378
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	379 if (attrib)
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	380 PyDict_Update(attrib, kwds);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	381 return attrib;
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	382 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	383
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	384 static int
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	385 element_init(PyObject self, PyObject args, PyObject *kwds)
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	386 {
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	387 PyObject *tag;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	388 PyObject *tmp;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	389 PyObject *attrib = NULL;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	390 ElementObject *self_elem;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	391
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	392 if (!PyArg_ParseTuple(args, "O\|O!:Element", &tag, &PyDict_Type, &attrib))
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	393 return -1;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	394
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	395 if (attrib) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	396 /* attrib passed as positional arg */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	397 attrib = PyDict_Copy(attrib);
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	398 if (!attrib)
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	399 return -1;
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	400 if (kwds) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	401 if (PyDict_Update(attrib, kwds) < 0) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	402 return -1;
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	403 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	404 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	405 } else if (kwds) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	406 /* have keywords args */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	407 attrib = get_attrib_from_keywords(kwds);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	408 if (!attrib)
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	409 return -1;
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	410 } else {
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	411 /* no attrib arg, no kwds, so no attributes */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	412 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	413 attrib = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	414 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	415
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	416 self_elem = (ElementObject *)self;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	417
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	418 if (attrib != Py_None && !is_empty_dict(attrib)) {
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	419 if (create_extra(self_elem, attrib) < 0) {
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	420 PyObject_Del(self_elem);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	421 return -1;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	422 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	423 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	424
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	425 /* We own a reference to attrib here and it's no longer needed. */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	426 Py_DECREF(attrib);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	427
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	428 /* Replace the objects already pointed to by tag, text and tail. */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	429 tmp = self_elem->tag;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	430 self_elem->tag = tag;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	431 Py_INCREF(tag);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	432 Py_DECREF(tmp);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	433
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	434 tmp = self_elem->text;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	435 self_elem->text = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	436 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	437 Py_DECREF(JOIN_OBJ(tmp));
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	438
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	439 tmp = self_elem->tail;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	440 self_elem->tail = Py_None;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	441 Py_INCREF(Py_None);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	442 Py_DECREF(JOIN_OBJ(tmp));
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	443
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	444 return 0;
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	445 }
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	446
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	447 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	448 element_resize(ElementObject* self, int extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	449 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	450 int size;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	451 PyObject* *children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	452
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	453 /* make sure self->children can hold the given number of extra
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	454 elements. set an exception and return -1 if allocation failed */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	455
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	456 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	457 create_extra(self, NULL);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	458
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	459 size = self->extra->length + extra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	460
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	461 if (size > self->extra->allocated) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	462 /* use Python 2.4's list growth strategy */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	463 size = (size >> 3) + (size < 9 ? 3 : 6) + size;
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	464 /* Coverity CID #182 size_error: Allocating 1 bytes to pointer "children"
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	465 * which needs at least 4 bytes.
d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	466 * Although it's a false alarm always assume at least one child to
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	467 * be safe.
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	468 */
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	469 size = size ? size : 1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	470 if (self->extra->children != self->extra->_children) {
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	471 /* Coverity CID #182 size_error: Allocating 1 bytes to pointer
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	472 * "children", which needs at least 4 bytes. Although it's a
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	473 * false alarm always assume at least one child to be safe.
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	474 */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	475 children = PyObject_Realloc(self->extra->children,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	476 size * sizeof(PyObject*));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	477 if (!children)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	478 goto nomemory;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	479 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	480 children = PyObject_Malloc(size * sizeof(PyObject*));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	481 if (!children)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	482 goto nomemory;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	483 /* copy existing children from static area to malloc buffer */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	484 memcpy(children, self->extra->children,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	485 self->extra->length * sizeof(PyObject*));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	486 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	487 self->extra->children = children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	488 self->extra->allocated = size;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	489 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	490
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	491 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	492
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	493 nomemory:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	494 PyErr_NoMemory();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	495 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	496 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	497
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	498 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	499 element_add_subelement(ElementObject* self, PyObject* element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	500 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	501 /* add a child element to a parent */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	502
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	503 if (element_resize(self, 1) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	504 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	505
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	506 Py_INCREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	507 self->extra->children[self->extra->length] = element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	508
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	509 self->extra->length++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	510
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	511 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	512 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	513
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	514 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	515 element_get_attrib(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	516 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	517 /* return borrowed reference to attrib dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	518 /* note: this function assumes that the extra section exists */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	519
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	520 PyObject* res = self->extra->attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	521
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	522 if (res == Py_None) {
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	523 Py_DECREF(res);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	524 /* create missing dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	525 res = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	526 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	527 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	528 self->extra->attrib = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	529 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	530
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	531 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	532 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	533
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	534 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	535 element_get_text(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	536 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	537 /* return borrowed reference to text attribute */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	538
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	539 PyObject* res = self->text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	540
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	541 if (JOIN_GET(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	542 res = JOIN_OBJ(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	543 if (PyList_CheckExact(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	544 res = list_join(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	545 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	546 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	547 self->text = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	548 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	549 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	550
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	551 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	552 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	553
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	554 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	555 element_get_tail(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	556 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	557 /* return borrowed reference to text attribute */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	558
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	559 PyObject* res = self->tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	560
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	561 if (JOIN_GET(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	562 res = JOIN_OBJ(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	563 if (PyList_CheckExact(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	564 res = list_join(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	565 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	566 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	567 self->tail = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	568 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	569 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	570
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	571 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	572 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	573
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	574 static PyObject*
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	575 subelement(PyObject self, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	576 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	577 PyObject* elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	578
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	579 ElementObject* parent;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	580 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	581 PyObject* attrib = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	582 if (!PyArg_ParseTuple(args, "O!O\|O!:SubElement",
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	583 &Element_Type, &parent, &tag,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	584 &PyDict_Type, &attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	585 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	586
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	587 if (attrib) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	588 /* attrib passed as positional arg */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	589 attrib = PyDict_Copy(attrib);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	590 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	591 return NULL;
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	592 if (kwds) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	593 if (PyDict_Update(attrib, kwds) < 0) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	594 return NULL;
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	595 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	596 }
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	597 } else if (kwds) {
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	598 /* have keyword args */
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	599 attrib = get_attrib_from_keywords(kwds);
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	600 if (!attrib)
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	601 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	602 } else {
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	603 /* no attrib arg, no kwds, so no attribute */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	604 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	605 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	606 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	607
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	608 elem = create_new_element(tag, attrib);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	609
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	610 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	611
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	612 if (element_add_subelement(parent, elem) < 0) {
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	613 Py_DECREF(elem);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	614 return NULL;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	615 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	616
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	617 return elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	618 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	619
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	620 static int
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	621 element_gc_traverse(ElementObject self, visitproc visit, void arg)
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	622 {
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	623 Py_VISIT(self->tag);
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	624 Py_VISIT(JOIN_OBJ(self->text));
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	625 Py_VISIT(JOIN_OBJ(self->tail));
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	626
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	627 if (self->extra) {
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	628 int i;
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	629 Py_VISIT(self->extra->attrib);
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	630
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	631 for (i = 0; i < self->extra->length; ++i)
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	632 Py_VISIT(self->extra->children[i]);
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	633 }
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	634 return 0;
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	635 }
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	636
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	637 static int
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	638 element_gc_clear(ElementObject *self)
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	639 {
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	640 Py_CLEAR(self->tag);
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	641
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	642 /* The following is like Py_CLEAR for self->text and self->tail, but
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	643 * written explicitily because the real pointers hide behind access
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	644 * macros.
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	645 */
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	646 if (self->text) {
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	647 PyObject *tmp = JOIN_OBJ(self->text);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	648 self->text = NULL;
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	649 Py_DECREF(tmp);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	650 }
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	651
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	652 if (self->tail) {
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	653 PyObject *tmp = JOIN_OBJ(self->tail);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	654 self->tail = NULL;
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	655 Py_DECREF(tmp);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	656 }
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	657
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	658 /* After dropping all references from extra, it's no longer valid anyway,
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	659 * so fully deallocate it.
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	660 */
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	661 dealloc_extra(self);
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	662 return 0;
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	663 }
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	664
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	665 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	666 element_dealloc(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	667 {
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	668 PyObject_GC_UnTrack(self);
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	669
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	670 if (self->weakreflist != NULL)
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	671 PyObject_ClearWeakRefs((PyObject *) self);
14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	672
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	673 /* element_gc_clear clears all references and deallocates extra
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	674 */
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	675 element_gc_clear(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	676
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	677 RELEASE(sizeof(ElementObject), "destroy element");
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	678 Py_TYPE(self)->tp_free((PyObject *)self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	679 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	680
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	681 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	682 /* methods (in alphabetical order) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	683
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	684 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	685 element_append(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	686 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	687 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	688 if (!PyArg_ParseTuple(args, "O!:append", &Element_Type, &element))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	689 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	690
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	691 if (element_add_subelement(self, element) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	692 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	693
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	694 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	695 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	696
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	697 static PyObject*
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	698 element_clearmethod(ElementObject* self, PyObject* args)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	699 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	700 if (!PyArg_ParseTuple(args, ":clear"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	701 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	702
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	703 dealloc_extra(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	704
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	705 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	706 Py_DECREF(JOIN_OBJ(self->text));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	707 self->text = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	708
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	709 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	710 Py_DECREF(JOIN_OBJ(self->tail));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	711 self->tail = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	712
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	713 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	714 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	715
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	716 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	717 element_copy(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	718 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	719 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	720 ElementObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	721
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	722 if (!PyArg_ParseTuple(args, ":__copy__"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	723 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	724
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	725 element = (ElementObject*) create_new_element(
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	726 self->tag, (self->extra) ? self->extra->attrib : Py_None
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	727 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	728 if (!element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	729 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	730
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	731 Py_DECREF(JOIN_OBJ(element->text));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	732 element->text = self->text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	733 Py_INCREF(JOIN_OBJ(element->text));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	734
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	735 Py_DECREF(JOIN_OBJ(element->tail));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	736 element->tail = self->tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	737 Py_INCREF(JOIN_OBJ(element->tail));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	738
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	739 if (self->extra) {
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	740
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	741 if (element_resize(element, self->extra->length) < 0) {
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	742 Py_DECREF(element);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	743 return NULL;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	744 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	745
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	746 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	747 Py_INCREF(self->extra->children[i]);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	748 element->extra->children[i] = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	749 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	750
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	751 element->extra->length = self->extra->length;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	752
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	753 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	754
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	755 return (PyObject*) element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	756 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	757
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	758 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	759 element_deepcopy(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	760 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	761 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	762 ElementObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	763 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	764 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	765 PyObject* text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	766 PyObject* tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	767 PyObject* id;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	768
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	769 PyObject* memo;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	770 if (!PyArg_ParseTuple(args, "O:__deepcopy__", &memo))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	771 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	772
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	773 tag = deepcopy(self->tag, memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	774 if (!tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	775 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	776
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	777 if (self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	778 attrib = deepcopy(self->extra->attrib, memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	779 if (!attrib) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	780 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	781 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	782 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	783 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	784 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	785 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	786 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	787
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	788 element = (ElementObject*) create_new_element(tag, attrib);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	789
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	790 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	791 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	792
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	793 if (!element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	794 return NULL;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	795
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	796 text = deepcopy(JOIN_OBJ(self->text), memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	797 if (!text)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	798 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	799 Py_DECREF(element->text);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	800 element->text = JOIN_SET(text, JOIN_GET(self->text));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	801
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	802 tail = deepcopy(JOIN_OBJ(self->tail), memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	803 if (!tail)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	804 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	805 Py_DECREF(element->tail);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	806 element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	807
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	808 if (self->extra) {
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	809
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	810 if (element_resize(element, self->extra->length) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	811 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	812
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	813 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	814 PyObject* child = deepcopy(self->extra->children[i], memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	815 if (!child) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	816 element->extra->length = i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	817 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	818 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	819 element->extra->children[i] = child;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	820 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	821
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	822 element->extra->length = self->extra->length;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	823
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	824 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	825
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	826 /* add object to memo dictionary (so deepcopy won't visit it again) */
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 42491 diff changeset	827 id = PyLong_FromLong((Py_uintptr_t) self);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	828 if (!id)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	829 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	830
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	831 i = PyDict_SetItem(memo, id, (PyObject*) element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	832
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	833 Py_DECREF(id);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	834
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	835 if (i < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	836 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	837
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	838 return (PyObject*) element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	839
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	840 error:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	841 Py_DECREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	842 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	843 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	844
77485 093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	845 static PyObject*
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	846 element_sizeof(PyObject* _self, PyObject* args)
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	847 {
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	848 ElementObject self = (ElementObject)_self;
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	849 Py_ssize_t result = sizeof(ElementObject);
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	850 if (self->extra) {
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	851 result += sizeof(ElementObjectExtra);
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	852 if (self->extra->children != self->extra->_children)
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	853 result += sizeof(PyObject) self->extra->allocated;
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	854 }
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	855 return PyLong_FromSsize_t(result);
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	856 }
093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	857
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	858 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	859 checkpath(PyObject* tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	860 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	861 Py_ssize_t i;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	862 int check = 1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	863
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	864 /* check if a tag contains an xpath character */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	865
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	866 #define PATHCHAR(ch) \
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	867 (ch == '/' \|\| ch == '*' \|\| ch == '[' \|\| ch == '@' \|\| ch == '.')
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	868
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	869 if (PyUnicode_Check(tag)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	870 const Py_ssize_t len = PyUnicode_GET_LENGTH(tag);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	871 void *data = PyUnicode_DATA(tag);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	872 unsigned int kind = PyUnicode_KIND(tag);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	873 for (i = 0; i < len; i++) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	874 Py_UCS4 ch = PyUnicode_READ(kind, data, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	875 if (ch == '{')
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	876 check = 0;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	877 else if (ch == '}')
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	878 check = 1;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	879 else if (check && PATHCHAR(ch))
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	880 return 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	881 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	882 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	883 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	884 if (PyBytes_Check(tag)) {
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	885 char *p = PyBytes_AS_STRING(tag);
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	886 for (i = 0; i < PyBytes_GET_SIZE(tag); i++) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	887 if (p[i] == '{')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	888 check = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	889 else if (p[i] == '}')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	890 check = 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	891 else if (check && PATHCHAR(p[i]))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	892 return 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	893 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	894 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	895 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	896
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	897 return 1; /* unknown type; might be path expression */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	898 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	899
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	900 static PyObject*
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	901 element_extend(ElementObject* self, PyObject* args)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	902 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	903 PyObject* seq;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	904 Py_ssize_t i, seqlen = 0;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	905
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	906 PyObject* seq_in;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	907 if (!PyArg_ParseTuple(args, "O:extend", &seq_in))
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	908 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	909
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	910 seq = PySequence_Fast(seq_in, "");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	911 if (!seq) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	912 PyErr_Format(
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	913 PyExc_TypeError,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	914 "expected sequence, not \"%.200s\"", Py_TYPE(seq_in)->tp_name
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	915 );
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	916 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	917 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	918
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	919 seqlen = PySequence_Size(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	920 for (i = 0; i < seqlen; i++) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	921 PyObject* element = PySequence_Fast_GET_ITEM(seq, i);
75894 75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	922 if (!PyObject_IsInstance(element, (PyObject *)&Element_Type)) {
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	923 Py_DECREF(seq);
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	924 PyErr_Format(
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	925 PyExc_TypeError,
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	926 "expected an Element, not \"%.200s\"",
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	927 Py_TYPE(element)->tp_name);
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	928 return NULL;
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	929 }
75268a773455 Issue #13782: streamline argument type-checking in ET.Element Eli Bendersky <eliben@gmail.com> parents: 75722 diff changeset	930
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	931 if (element_add_subelement(self, element) < 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	932 Py_DECREF(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	933 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	934 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	935 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	936
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	937 Py_DECREF(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	938
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	939 Py_RETURN_NONE;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	940 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	941
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	942 static PyObject*
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	943 element_find(ElementObject self, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	944 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	945 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	946 PyObject* tag;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	947 PyObject* namespaces = Py_None;
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	948 static char *kwlist[] = {"path", "namespaces", 0};
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	949
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	950 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:find", kwlist,
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	951 &tag, &namespaces))
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	952 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	953
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	954 if (checkpath(tag) \|\| namespaces != Py_None) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	955 _Py_IDENTIFIER(find);
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	956 return _PyObject_CallMethodId(
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	957 elementpath_obj, &PyId_find, "OOO", self, tag, namespaces
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	958 );
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	959 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	960
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	961 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	962 Py_RETURN_NONE;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	963
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	964 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	965 PyObject* item = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	966 if (Element_CheckExact(item) &&
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48660 diff changeset	967 PyObject_RichCompareBool(((ElementObject*)item)->tag, tag, Py_EQ) == 1) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	968 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	969 return item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	970 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	971 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	972
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	973 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	974 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	975
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	976 static PyObject*
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	977 element_findtext(ElementObject self, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	978 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	979 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	980 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	981 PyObject* default_value = Py_None;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	982 PyObject* namespaces = Py_None;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	983 _Py_IDENTIFIER(findtext);
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	984 static char *kwlist[] = {"path", "default", "namespaces", 0};
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	985
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	986 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|OO:findtext", kwlist,
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	987 &tag, &default_value, &namespaces))
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	988 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	989
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	990 if (checkpath(tag) \|\| namespaces != Py_None)
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	991 return _PyObject_CallMethodId(
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	992 elementpath_obj, &PyId_findtext, "OOOO", self, tag, default_value, namespaces
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	993 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	994
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	995 if (!self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	996 Py_INCREF(default_value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	997 return default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	998 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	999
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1000 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1001 ElementObject* item = (ElementObject*) self->extra->children[i];
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48660 diff changeset	1002 if (Element_CheckExact(item) && (PyObject_RichCompareBool(item->tag, tag, Py_EQ) == 1)) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48660 diff changeset	1003
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1004 PyObject* text = element_get_text(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1005 if (text == Py_None)
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	1006 return PyBytes_FromString("");
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1007 Py_XINCREF(text);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1008 return text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1009 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1010 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1011
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1012 Py_INCREF(default_value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1013 return default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1014 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1015
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1016 static PyObject*
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1017 element_findall(ElementObject self, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1018 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1019 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1020 PyObject* out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1021 PyObject* tag;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1022 PyObject* namespaces = Py_None;
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1023 static char *kwlist[] = {"path", "namespaces", 0};
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1024
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1025 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:findall", kwlist,
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1026 &tag, &namespaces))
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1027 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1028
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1029 if (checkpath(tag) \|\| namespaces != Py_None) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	1030 _Py_IDENTIFIER(findall);
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1031 return _PyObject_CallMethodId(
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1032 elementpath_obj, &PyId_findall, "OOO", self, tag, namespaces
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1033 );
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1034 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1035
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1036 out = PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1037 if (!out)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1038 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1039
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1040 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1041 return out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1042
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1043 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1044 PyObject* item = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1045 if (Element_CheckExact(item) &&
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48660 diff changeset	1046 PyObject_RichCompareBool(((ElementObject*)item)->tag, tag, Py_EQ) == 1) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1047 if (PyList_Append(out, item) < 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1048 Py_DECREF(out);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1049 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1050 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1051 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1052 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1053
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1054 return out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1055 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1056
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1057 static PyObject*
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1058 element_iterfind(ElementObject self, PyObject args, PyObject *kwds)
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1059 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1060 PyObject* tag;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1061 PyObject* namespaces = Py_None;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	1062 _Py_IDENTIFIER(iterfind);
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1063 static char *kwlist[] = {"path", "namespaces", 0};
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1064
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1065 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|O:iterfind", kwlist,
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1066 &tag, &namespaces))
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1067 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1068
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1069 return _PyObject_CallMethodId(
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72475 diff changeset	1070 elementpath_obj, &PyId_iterfind, "OOO", self, tag, namespaces
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1071 );
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1072 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1073
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1074 static PyObject*
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1075 element_get(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1076 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1077 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1078
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1079 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1080 PyObject* default_value = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1081 if (!PyArg_ParseTuple(args, "O\|O:get", &key, &default_value))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1082 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1083
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1084 if (!self->extra \|\| self->extra->attrib == Py_None)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1085 value = default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1086 else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1087 value = PyDict_GetItem(self->extra->attrib, key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1088 if (!value)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1089 value = default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1090 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1091
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1092 Py_INCREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1093 return value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1094 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1095
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1096 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1097 element_getchildren(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1098 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1099 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1100 PyObject* list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1101
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1102 /* FIXME: report as deprecated? */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1103
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1104 if (!PyArg_ParseTuple(args, ":getchildren"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1105 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1106
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1107 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1108 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1109
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1110 list = PyList_New(self->extra->length);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1111 if (!list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1112 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1113
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1114 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1115 PyObject* item = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1116 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1117 PyList_SET_ITEM(list, i, item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1118 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1119
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1120 return list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1121 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1122
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1123
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1124 static PyObject *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1125 create_elementiter(ElementObject self, PyObject tag, int gettext);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1126
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1127
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1128 static PyObject *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1129 element_iter(ElementObject self, PyObject args)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1130 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1131 PyObject* tag = Py_None;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1132 if (!PyArg_ParseTuple(args, "\|O:iter", &tag))
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1133 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1134
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1135 return create_elementiter(self, tag, 0);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1136 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1137
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1138
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1139 static PyObject*
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1140 element_itertext(ElementObject* self, PyObject* args)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1141 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1142 if (!PyArg_ParseTuple(args, ":itertext"))
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1143 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1144
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1145 return create_elementiter(self, Py_None, 1);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1146 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1147
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1148
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1149 static PyObject*
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1150 element_getitem(PyObject* self_, Py_ssize_t index)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1151 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1152 ElementObject* self = (ElementObject*) self_;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1153
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1154 if (!self->extra \|\| index < 0 \|\| index >= self->extra->length) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1155 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1156 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1157 "child index out of range"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1158 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1159 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1160 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1161
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1162 Py_INCREF(self->extra->children[index]);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1163 return self->extra->children[index];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1164 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1165
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1166 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1167 element_insert(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1168 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1169 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1170
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1171 int index;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1172 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1173 if (!PyArg_ParseTuple(args, "iO!:insert", &index,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1174 &Element_Type, &element))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1175 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1176
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1177 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1178 create_extra(self, NULL);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1179
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1180 if (index < 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1181 index += self->extra->length;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1182 if (index < 0)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1183 index = 0;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1184 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1185 if (index > self->extra->length)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1186 index = self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1187
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1188 if (element_resize(self, 1) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1189 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1190
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1191 for (i = self->extra->length; i > index; i--)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1192 self->extra->children[i] = self->extra->children[i-1];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1193
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1194 Py_INCREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1195 self->extra->children[index] = element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1196
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1197 self->extra->length++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1198
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1199 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1200 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1201
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1202 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1203 element_items(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1204 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1205 if (!PyArg_ParseTuple(args, ":items"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1206 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1207
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1208 if (!self->extra \|\| self->extra->attrib == Py_None)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1209 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1210
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1211 return PyDict_Items(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1212 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1213
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1214 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1215 element_keys(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1216 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1217 if (!PyArg_ParseTuple(args, ":keys"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1218 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1219
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1220 if (!self->extra \|\| self->extra->attrib == Py_None)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1221 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1222
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1223 return PyDict_Keys(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1224 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1225
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1226 static Py_ssize_t
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1227 element_length(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1228 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1229 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1230 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1231
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1232 return self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1233 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1234
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1235 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1236 element_makeelement(PyObject* self, PyObject* args, PyObject* kw)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1237 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1238 PyObject* elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1239
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1240 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1241 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1242 if (!PyArg_ParseTuple(args, "OO:makeelement", &tag, &attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1243 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1244
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1245 attrib = PyDict_Copy(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1246 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1247 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1248
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1249 elem = create_new_element(tag, attrib);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1250
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1251 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1252
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1253 return elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1254 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1255
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1256 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1257 element_remove(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1258 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1259 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1260
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1261 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1262 if (!PyArg_ParseTuple(args, "O!:remove", &Element_Type, &element))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1263 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1264
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1265 if (!self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1266 /* element has no children, so raise exception */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1267 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1268 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1269 "list.remove(x): x not in list"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1270 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1271 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1272 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1273
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1274 for (i = 0; i < self->extra->length; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1275 if (self->extra->children[i] == element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1276 break;
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48660 diff changeset	1277 if (PyObject_RichCompareBool(self->extra->children[i], element, Py_EQ) == 1)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1278 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1279 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1280
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1281 if (i == self->extra->length) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1282 /* element is not in children, so raise exception */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1283 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1284 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1285 "list.remove(x): x not in list"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1286 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1287 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1288 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1289
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1290 Py_DECREF(self->extra->children[i]);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1291
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1292 self->extra->length--;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1293
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1294 for (; i < self->extra->length; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1295 self->extra->children[i] = self->extra->children[i+1];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1296
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1297 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1298 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1299
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1300 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1301 element_repr(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1302 {
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1303 if (self->tag)
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1304 return PyUnicode_FromFormat("<Element %R at %p>", self->tag, self);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1305 else
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1306 return PyUnicode_FromFormat("<Element at %p>", self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1307 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1308
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1309 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1310 element_set(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1311 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1312 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1313
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1314 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1315 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1316 if (!PyArg_ParseTuple(args, "OO:set", &key, &value))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1317 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1318
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1319 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1320 create_extra(self, NULL);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1321
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1322 attrib = element_get_attrib(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1323 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1324 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1325
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1326 if (PyDict_SetItem(attrib, key, value) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1327 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1328
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1329 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1330 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1331
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1332 static int
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1333 element_setitem(PyObject* self_, Py_ssize_t index, PyObject* item)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1334 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1335 ElementObject* self = (ElementObject*) self_;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1336 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1337 PyObject* old;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1338
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1339 if (!self->extra \|\| index < 0 \|\| index >= self->extra->length) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1340 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1341 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1342 "child assignment index out of range");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1343 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1344 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1345
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1346 old = self->extra->children[index];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1347
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1348 if (item) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1349 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1350 self->extra->children[index] = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1351 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1352 self->extra->length--;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1353 for (i = index; i < self->extra->length; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1354 self->extra->children[i] = self->extra->children[i+1];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1355 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1356
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1357 Py_DECREF(old);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1358
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1359 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1360 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1361
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1362 static PyObject*
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1363 element_subscr(PyObject* self_, PyObject* item)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1364 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1365 ElementObject* self = (ElementObject*) self_;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1366
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1367 if (PyIndex_Check(item)) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1368 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1369
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1370 if (i == -1 && PyErr_Occurred()) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1371 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1372 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1373 if (i < 0 && self->extra)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1374 i += self->extra->length;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1375 return element_getitem(self_, i);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1376 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1377 else if (PySlice_Check(item)) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1378 Py_ssize_t start, stop, step, slicelen, cur, i;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1379 PyObject* list;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1380
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1381 if (!self->extra)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1382 return PyList_New(0);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1383
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	1384 if (PySlice_GetIndicesEx(item,
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1385 self->extra->length,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1386 &start, &stop, &step, &slicelen) < 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1387 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1388 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1389
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1390 if (slicelen <= 0)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1391 return PyList_New(0);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1392 else {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1393 list = PyList_New(slicelen);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1394 if (!list)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1395 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1396
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1397 for (cur = start, i = 0; i < slicelen;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1398 cur += step, i++) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1399 PyObject* item = self->extra->children[cur];
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1400 Py_INCREF(item);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1401 PyList_SET_ITEM(list, i, item);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1402 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1403
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1404 return list;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1405 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1406 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1407 else {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1408 PyErr_SetString(PyExc_TypeError,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1409 "element indices must be integers");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1410 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1411 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1412 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1413
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1414 static int
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1415 element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1416 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1417 ElementObject* self = (ElementObject*) self_;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1418
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1419 if (PyIndex_Check(item)) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1420 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1421
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1422 if (i == -1 && PyErr_Occurred()) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1423 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1424 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1425 if (i < 0 && self->extra)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1426 i += self->extra->length;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1427 return element_setitem(self_, i, value);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1428 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1429 else if (PySlice_Check(item)) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1430 Py_ssize_t start, stop, step, slicelen, newlen, cur, i;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1431
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1432 PyObject* recycle = NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1433 PyObject* seq = NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1434
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1435 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1436 create_extra(self, NULL);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1437
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	1438 if (PySlice_GetIndicesEx(item,
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1439 self->extra->length,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1440 &start, &stop, &step, &slicelen) < 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1441 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1442 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1443
75505 1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1444 if (value == NULL) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1445 /* Delete slice */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1446 size_t cur;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1447 Py_ssize_t i;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1448
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1449 if (slicelen <= 0)
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1450 return 0;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1451
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1452 /* Since we're deleting, the direction of the range doesn't matter,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1453 * so for simplicity make it always ascending.
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1454 */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1455 if (step < 0) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1456 stop = start + 1;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1457 start = stop + step * (slicelen - 1) - 1;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1458 step = -step;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1459 }
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1460
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1461 assert((size_t)slicelen <= PY_SIZE_MAX / sizeof(PyObject *));
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1462
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1463 /* recycle is a list that will contain all the children
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1464 * scheduled for removal.
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1465 */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1466 if (!(recycle = PyList_New(slicelen))) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1467 PyErr_NoMemory();
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1468 return -1;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1469 }
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1470
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1471 /* This loop walks over all the children that have to be deleted,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1472 * with cur pointing at them. num_moved is the amount of children
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1473 * until the next deleted child that have to be "shifted down" to
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1474 * occupy the deleted's places.
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1475 * Note that in the ith iteration, shifting is done i+i places down
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1476 * because i children were already removed.
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1477 */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1478 for (cur = start, i = 0; cur < (size_t)stop; cur += step, ++i) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1479 /* Compute how many children have to be moved, clipping at the
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1480 * list end.
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1481 */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1482 Py_ssize_t num_moved = step - 1;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1483 if (cur + step >= (size_t)self->extra->length) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1484 num_moved = self->extra->length - cur - 1;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1485 }
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1486
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1487 PyList_SET_ITEM(recycle, i, self->extra->children[cur]);
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1488
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1489 memmove(
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1490 self->extra->children + cur - i,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1491 self->extra->children + cur + 1,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1492 num_moved * sizeof(PyObject *));
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1493 }
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1494
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1495 /* Leftover "tail" after the last removed child */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1496 cur = start + (size_t)slicelen * step;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1497 if (cur < (size_t)self->extra->length) {
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1498 memmove(
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1499 self->extra->children + cur - slicelen,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1500 self->extra->children + cur,
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1501 (self->extra->length - cur) * sizeof(PyObject *));
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1502 }
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1503
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1504 self->extra->length -= slicelen;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1505
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1506 /* Discard the recycle list with all the deleted sub-elements */
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1507 Py_XDECREF(recycle);
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1508 return 0;
1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1509 }
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1510 else {
75505 1a721b9a4039 Issue #14178: Problem deleting slices with steps != +1 in the _elementtree module. Eli Bendersky <eliben@gmail.com> parents: 75410 diff changeset	1511 /* A new slice is actually being assigned */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1512 seq = PySequence_Fast(value, "");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1513 if (!seq) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1514 PyErr_Format(
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1515 PyExc_TypeError,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1516 "expected sequence, not \"%.200s\"", Py_TYPE(value)->tp_name
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1517 );
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1518 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1519 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1520 newlen = PySequence_Size(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1521 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1522
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1523 if (step != 1 && newlen != slicelen)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1524 {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1525 PyErr_Format(PyExc_ValueError,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1526 "attempt to assign sequence of size %zd "
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1527 "to extended slice of size %zd",
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1528 newlen, slicelen
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1529 );
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1530 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1531 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1532
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1533 /* Resize before creating the recycle bin, to prevent refleaks. */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1534 if (newlen > slicelen) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1535 if (element_resize(self, newlen - slicelen) < 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1536 if (seq) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1537 Py_DECREF(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1538 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1539 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1540 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1541 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1542
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1543 if (slicelen > 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1544 /* to avoid recursive calls to this method (via decref), move
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1545 old items to the recycle bin here, and get rid of them when
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1546 we're done modifying the element */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1547 recycle = PyList_New(slicelen);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1548 if (!recycle) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1549 if (seq) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1550 Py_DECREF(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1551 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1552 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1553 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1554 for (cur = start, i = 0; i < slicelen;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1555 cur += step, i++)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1556 PyList_SET_ITEM(recycle, i, self->extra->children[cur]);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1557 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1558
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1559 if (newlen < slicelen) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1560 /* delete slice */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1561 for (i = stop; i < self->extra->length; i++)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1562 self->extra->children[i + newlen - slicelen] = self->extra->children[i];
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1563 } else if (newlen > slicelen) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1564 /* insert slice */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1565 for (i = self->extra->length-1; i >= stop; i--)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1566 self->extra->children[i + newlen - slicelen] = self->extra->children[i];
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1567 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1568
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1569 /* replace the slice */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1570 for (cur = start, i = 0; i < newlen;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1571 cur += step, i++) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1572 PyObject* element = PySequence_Fast_GET_ITEM(seq, i);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1573 Py_INCREF(element);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1574 self->extra->children[cur] = element;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1575 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1576
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1577 self->extra->length += newlen - slicelen;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1578
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1579 if (seq) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1580 Py_DECREF(seq);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1581 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1582
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1583 /* discard the recycle bin, and everything in it */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1584 Py_XDECREF(recycle);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1585
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1586 return 0;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1587 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1588 else {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1589 PyErr_SetString(PyExc_TypeError,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1590 "element indices must be integers");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1591 return -1;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1592 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1593 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1594
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1595 static PyMethodDef element_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1596
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	1597 {"clear", (PyCFunction) element_clearmethod, METH_VARARGS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1598
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1599 {"get", (PyCFunction) element_get, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1600 {"set", (PyCFunction) element_set, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1601
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1602 {"find", (PyCFunction) element_find, METH_VARARGS \| METH_KEYWORDS},
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1603 {"findtext", (PyCFunction) element_findtext, METH_VARARGS \| METH_KEYWORDS},
7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1604 {"findall", (PyCFunction) element_findall, METH_VARARGS \| METH_KEYWORDS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1605
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1606 {"append", (PyCFunction) element_append, METH_VARARGS},
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1607 {"extend", (PyCFunction) element_extend, METH_VARARGS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1608 {"insert", (PyCFunction) element_insert, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1609 {"remove", (PyCFunction) element_remove, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1610
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1611 {"iter", (PyCFunction) element_iter, METH_VARARGS},
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1612 {"itertext", (PyCFunction) element_itertext, METH_VARARGS},
77217 7d252dbfbee3 Issue 14814: Add namespaces keyword arg to find() methods in _elementtree. Eli Bendersky <eliben@gmail.com>* parents: 77062 diff changeset	1613 {"iterfind", (PyCFunction) element_iterfind, METH_VARARGS \| METH_KEYWORDS},
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1614
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1615 {"getiterator", (PyCFunction) element_iter, METH_VARARGS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1616 {"getchildren", (PyCFunction) element_getchildren, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1617
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1618 {"items", (PyCFunction) element_items, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1619 {"keys", (PyCFunction) element_keys, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1620
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1621 {"makeelement", (PyCFunction) element_makeelement, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1622
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1623 {"__copy__", (PyCFunction) element_copy, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1624 {"__deepcopy__", (PyCFunction) element_deepcopy, METH_VARARGS},
77485 093dec81ea1f Issue #14055: Add __sizeof__ support to _elementtree. Martin v. Löwis <martin@v.loewis.de> parents: 77432 diff changeset	1625 {"__sizeof__", element_sizeof, METH_NOARGS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1626
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1627 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1628 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1629
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1630 static PyObject*
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1631 element_getattro(ElementObject* self, PyObject* nameobj)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1632 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1633 PyObject* res;
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1634 char *name = "";
4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1635
4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1636 if (PyUnicode_Check(nameobj))
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1637 name = _PyUnicode_AsString(nameobj);
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	1638
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	1639 if (name == NULL)
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	1640 return NULL;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1641
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1642 /* handle common attributes first */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1643 if (strcmp(name, "tag") == 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1644 res = self->tag;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1645 Py_INCREF(res);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1646 return res;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1647 } else if (strcmp(name, "text") == 0) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1648 res = element_get_text(self);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1649 Py_INCREF(res);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1650 return res;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1651 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1652
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1653 /* methods */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1654 res = PyObject_GenericGetAttr((PyObject*) self, nameobj);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1655 if (res)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1656 return res;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1657
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1658 /* less common attributes */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1659 if (strcmp(name, "tail") == 0) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1660 PyErr_Clear();
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1661 res = element_get_tail(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1662 } else if (strcmp(name, "attrib") == 0) {
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1663 PyErr_Clear();
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1664 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1665 create_extra(self, NULL);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1666 res = element_get_attrib(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1667 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1668
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1669 if (!res)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1670 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1671
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1672 Py_INCREF(res);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1673 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1674 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1675
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1676 static PyObject*
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1677 element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1678 {
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1679 char *name = "";
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1680 if (PyUnicode_Check(nameobj))
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1681 name = _PyUnicode_AsString(nameobj);
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1682
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1683 if (name == NULL)
41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1684 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1685
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1686 if (strcmp(name, "tag") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1687 Py_DECREF(self->tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1688 self->tag = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1689 Py_INCREF(self->tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1690 } else if (strcmp(name, "text") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1691 Py_DECREF(JOIN_OBJ(self->text));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1692 self->text = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1693 Py_INCREF(self->text);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1694 } else if (strcmp(name, "tail") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1695 Py_DECREF(JOIN_OBJ(self->tail));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1696 self->tail = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1697 Py_INCREF(self->tail);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1698 } else if (strcmp(name, "attrib") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1699 if (!self->extra)
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1700 create_extra(self, NULL);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1701 Py_DECREF(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1702 self->extra->attrib = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1703 Py_INCREF(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1704 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1705 PyErr_SetString(PyExc_AttributeError, name);
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1706 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1707 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1708
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1709 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1710 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1711
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1712 static PySequenceMethods element_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1713 (lenfunc) element_length,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1714 0, /* sq_concat */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1715 0, /* sq_repeat */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1716 element_getitem,
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1717 0,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1718 element_setitem,
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1719 0,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1720 };
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1721
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1722 static PyMappingMethods element_as_mapping = {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1723 (lenfunc) element_length,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1724 (binaryfunc) element_subscr,
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	1725 (objobjargproc) element_ass_subscr,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1726 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1727
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	1728 static PyTypeObject Element_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	1729 PyVarObject_HEAD_INIT(NULL, 0)
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	1730 "Element", sizeof(ElementObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1731 /* methods */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1732 (destructor)element_dealloc, /* tp_dealloc */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1733 0, /* tp_print */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1734 0, /* tp_getattr */
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1735 0, /* tp_setattr */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1736 0, /* tp_reserved */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1737 (reprfunc)element_repr, /* tp_repr */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1738 0, /* tp_as_number */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1739 &element_as_sequence, /* tp_as_sequence */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1740 &element_as_mapping, /* tp_as_mapping */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1741 0, /* tp_hash */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1742 0, /* tp_call */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1743 0, /* tp_str */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1744 (getattrofunc)element_getattro, /* tp_getattro */
77062 41a9d24d075e Issue #14849: setup Element data members to be assignable in subclasses Eli Bendersky <eliben@gmail.com> parents: 76110 diff changeset	1745 (setattrofunc)element_setattro, /* tp_setattro */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1746 0, /* tp_as_buffer */
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	1747 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	1748 /* tp_flags */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1749 0, /* tp_doc */
75997 0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	1750 (traverseproc)element_gc_traverse, /* tp_traverse */
0ca32013d77e Issue #14065: Added cyclic GC support to ET.Element Eli Bendersky <eliben@gmail.com> parents: 75894 diff changeset	1751 (inquiry)element_gc_clear, /* tp_clear */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1752 0, /* tp_richcompare */
76098 14abfa27ff19 Fixes and enhancements to _elementtree: Eli Bendersky <eliben@gmail.com> parents: 75997 diff changeset	1753 offsetof(ElementObject, weakreflist), /* tp_weaklistoffset */
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1754 0, /* tp_iter */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1755 0, /* tp_iternext */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1756 element_methods, /* tp_methods */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1757 0, /* tp_members */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1758 0, /* tp_getset */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1759 0, /* tp_base */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1760 0, /* tp_dict */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1761 0, /* tp_descr_get */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1762 0, /* tp_descr_set */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1763 0, /* tp_dictoffset */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1764 (initproc)element_init, /* tp_init */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1765 PyType_GenericAlloc, /* tp_alloc */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1766 element_new, /* tp_new */
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	1767 0, /* tp_free */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1768 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1769
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1770 /***************************** Element iterator **************************/
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1771
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1772 /* ElementIterObject represents the iteration state over an XML element in
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1773 * pre-order traversal. To keep track of which sub-element should be returned
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1774 * next, a stack of parents is maintained. This is a standard stack-based
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1775 * iterative pre-order traversal of a tree.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1776 * The stack is managed using a single-linked list starting at parent_stack.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1777 * Each stack node contains the saved parent to which we should return after
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1778 * the current one is exhausted, and the next child to examine in that parent.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1779 */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1780 typedef struct ParentLocator_t {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1781 ElementObject *parent;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1782 Py_ssize_t child_index;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1783 struct ParentLocator_t *next;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1784 } ParentLocator;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1785
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1786 typedef struct {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1787 PyObject_HEAD
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1788 ParentLocator *parent_stack;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1789 ElementObject *root_element;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1790 PyObject *sought_tag;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1791 int root_done;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1792 int gettext;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1793 } ElementIterObject;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1794
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1795
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1796 static void
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1797 elementiter_dealloc(ElementIterObject *it)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1798 {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1799 ParentLocator *p = it->parent_stack;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1800 while (p) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1801 ParentLocator *temp = p;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1802 Py_XDECREF(p->parent);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1803 p = p->next;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1804 PyObject_Free(temp);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1805 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1806
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1807 Py_XDECREF(it->sought_tag);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1808 Py_XDECREF(it->root_element);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1809
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1810 PyObject_GC_UnTrack(it);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1811 PyObject_GC_Del(it);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1812 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1813
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1814 static int
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1815 elementiter_traverse(ElementIterObject it, visitproc visit, void arg)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1816 {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1817 ParentLocator *p = it->parent_stack;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1818 while (p) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1819 Py_VISIT(p->parent);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1820 p = p->next;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1821 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1822
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1823 Py_VISIT(it->root_element);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1824 Py_VISIT(it->sought_tag);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1825 return 0;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1826 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1827
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1828 /* Helper function for elementiter_next. Add a new parent to the parent stack.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1829 */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1830 static ParentLocator *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1831 parent_stack_push_new(ParentLocator stack, ElementObject parent)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1832 {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1833 ParentLocator *new_node = PyObject_Malloc(sizeof(ParentLocator));
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1834 if (new_node) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1835 new_node->parent = parent;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1836 Py_INCREF(parent);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1837 new_node->child_index = 0;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1838 new_node->next = stack;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1839 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1840 return new_node;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1841 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1842
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1843 static PyObject *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1844 elementiter_next(ElementIterObject *it)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1845 {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1846 /* Sub-element iterator.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1847 *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1848 * A short note on gettext: this function serves both the iter() and
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1849 * itertext() methods to avoid code duplication. However, there are a few
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1850 * small differences in the way these iterations work. Namely:
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1851 * - itertext() only yields text from nodes that have it, and continues
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1852 * iterating when a node doesn't have text (so it doesn't return any
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1853 * node like iter())
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1854 * - itertext() also has to handle tail, after finishing with all the
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1855 * children of a node.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1856 */
77432 3c089edbf02c Fix windows compilation problems caused by previous commit. Eli Bendersky <eliben@gmail.com> parents: 77431 diff changeset	1857 ElementObject *cur_parent;
3c089edbf02c Fix windows compilation problems caused by previous commit. Eli Bendersky <eliben@gmail.com> parents: 77431 diff changeset	1858 Py_ssize_t child_index;
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1859
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1860 while (1) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1861 /* Handle the case reached in the beginning and end of iteration, where
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1862 * the parent stack is empty. The root_done flag gives us indication
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1863 * whether we've just started iterating (so root_done is 0), in which
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1864 * case the root is returned. If root_done is 1 and we're here, the
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1865 * iterator is exhausted.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1866 */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1867 if (!it->parent_stack->parent) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1868 if (it->root_done) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1869 PyErr_SetNone(PyExc_StopIteration);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1870 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1871 } else {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1872 it->parent_stack = parent_stack_push_new(it->parent_stack,
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1873 it->root_element);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1874 if (!it->parent_stack) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1875 PyErr_NoMemory();
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1876 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1877 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1878
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1879 it->root_done = 1;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1880 if (it->sought_tag == Py_None \|\|
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1881 PyObject_RichCompareBool(it->root_element->tag,
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1882 it->sought_tag, Py_EQ) == 1) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1883 if (it->gettext) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1884 PyObject *text = JOIN_OBJ(it->root_element->text);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1885 if (PyObject_IsTrue(text)) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1886 Py_INCREF(text);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1887 return text;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1888 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1889 } else {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1890 Py_INCREF(it->root_element);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1891 return (PyObject *)it->root_element;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1892 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1893 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1894 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1895 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1896
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1897 /* See if there are children left to traverse in the current parent. If
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1898 * yes, visit the next child. If not, pop the stack and try again.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1899 */
77432 3c089edbf02c Fix windows compilation problems caused by previous commit. Eli Bendersky <eliben@gmail.com> parents: 77431 diff changeset	1900 cur_parent = it->parent_stack->parent;
3c089edbf02c Fix windows compilation problems caused by previous commit. Eli Bendersky <eliben@gmail.com> parents: 77431 diff changeset	1901 child_index = it->parent_stack->child_index;
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1902 if (cur_parent->extra && child_index < cur_parent->extra->length) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1903 ElementObject child = (ElementObject )
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1904 cur_parent->extra->children[child_index];
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1905 it->parent_stack->child_index++;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1906 it->parent_stack = parent_stack_push_new(it->parent_stack,
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1907 child);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1908 if (!it->parent_stack) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1909 PyErr_NoMemory();
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1910 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1911 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1912
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1913 if (it->gettext) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1914 PyObject *text = JOIN_OBJ(child->text);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1915 if (PyObject_IsTrue(text)) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1916 Py_INCREF(text);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1917 return text;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1918 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1919 } else if (it->sought_tag == Py_None \|\|
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1920 PyObject_RichCompareBool(child->tag,
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1921 it->sought_tag, Py_EQ) == 1) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1922 Py_INCREF(child);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1923 return (PyObject *)child;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1924 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1925 else
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1926 continue;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1927 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1928 else {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1929 PyObject *tail = it->gettext ? JOIN_OBJ(cur_parent->tail) : Py_None;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1930 ParentLocator *next = it->parent_stack->next;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1931 Py_XDECREF(it->parent_stack->parent);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1932 PyObject_Free(it->parent_stack);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1933 it->parent_stack = next;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1934
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1935 /* Note that extra condition on it->parent_stack->parent here;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1936 * this is because itertext() is supposed to only return inner
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1937 * text, not text following the element it began iteration with.
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1938 */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1939 if (it->parent_stack->parent && PyObject_IsTrue(tail)) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1940 Py_INCREF(tail);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1941 return tail;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1942 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1943 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1944 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1945
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1946 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1947 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1948
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1949
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1950 static PyTypeObject ElementIter_Type = {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1951 PyVarObject_HEAD_INIT(NULL, 0)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1952 "_elementtree._element_iterator", /* tp_name */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1953 sizeof(ElementIterObject), /* tp_basicsize */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1954 0, /* tp_itemsize */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1955 /* methods */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1956 (destructor)elementiter_dealloc, /* tp_dealloc */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1957 0, /* tp_print */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1958 0, /* tp_getattr */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1959 0, /* tp_setattr */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1960 0, /* tp_reserved */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1961 0, /* tp_repr */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1962 0, /* tp_as_number */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1963 0, /* tp_as_sequence */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1964 0, /* tp_as_mapping */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1965 0, /* tp_hash */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1966 0, /* tp_call */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1967 0, /* tp_str */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1968 0, /* tp_getattro */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1969 0, /* tp_setattro */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1970 0, /* tp_as_buffer */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1971 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1972 0, /* tp_doc */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1973 (traverseproc)elementiter_traverse, /* tp_traverse */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1974 0, /* tp_clear */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1975 0, /* tp_richcompare */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1976 0, /* tp_weaklistoffset */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1977 PyObject_SelfIter, /* tp_iter */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1978 (iternextfunc)elementiter_next, /* tp_iternext */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1979 0, /* tp_methods */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1980 0, /* tp_members */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1981 0, /* tp_getset */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1982 0, /* tp_base */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1983 0, /* tp_dict */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1984 0, /* tp_descr_get */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1985 0, /* tp_descr_set */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1986 0, /* tp_dictoffset */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1987 0, /* tp_init */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1988 0, /* tp_alloc */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1989 0, /* tp_new */
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1990 };
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1991
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1992
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1993 static PyObject *
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1994 create_elementiter(ElementObject self, PyObject tag, int gettext)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1995 {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1996 ElementIterObject *it;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1997 PyObject *star = NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1998
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	1999 it = PyObject_GC_New(ElementIterObject, &ElementIter_Type);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2000 if (!it)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2001 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2002 if (!(it->parent_stack = PyObject_Malloc(sizeof(ParentLocator)))) {
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2003 PyObject_GC_Del(it);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2004 return NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2005 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2006
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2007 it->parent_stack->parent = NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2008 it->parent_stack->child_index = 0;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2009 it->parent_stack->next = NULL;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2010
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2011 if (PyUnicode_Check(tag))
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2012 star = PyUnicode_FromString("*");
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2013 else if (PyBytes_Check(tag))
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2014 star = PyBytes_FromString("*");
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2015
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2016 if (star && PyObject_RichCompareBool(tag, star, Py_EQ) == 1)
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2017 tag = Py_None;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2018
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2019 Py_XDECREF(star);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2020 it->sought_tag = tag;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2021 it->root_done = 0;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2022 it->gettext = gettext;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2023 it->root_element = self;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2024
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2025 Py_INCREF(self);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2026 Py_INCREF(tag);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2027
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2028 PyObject_GC_Track(it);
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2029 return (PyObject *)it;
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2030 }
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2031
652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	2032
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2033 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2034 /* the tree builder type */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2035
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2036 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2037 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2038
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2039 PyObject root; / root node (first created node) */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2040
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2041 ElementObject this; / current node */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2042 ElementObject last; / most recently created node */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2043
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2044 PyObject data; / data collector (string or list), or NULL */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2045
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2046 PyObject stack; / element stack */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2047 Py_ssize_t index; /* current stack size (0 means empty) */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2048
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2049 PyObject *element_factory;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2050
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2051 /* element tracing */
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2052 PyObject events; / list of events, or NULL if not collecting */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2053 PyObject start_event_obj; / event objects (NULL to ignore) */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2054 PyObject *end_event_obj;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2055 PyObject *start_ns_event_obj;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2056 PyObject *end_ns_event_obj;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2057 } TreeBuilderObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2058
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	2059 static PyTypeObject TreeBuilder_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2060
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	2061 #define TreeBuilder_CheckExact(op) (Py_TYPE(op) == &TreeBuilder_Type)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2062
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2063 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2064 /* constructor and destructor */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2065
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2066 static PyObject *
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2067 treebuilder_new(PyTypeObject type, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2068 {
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2069 TreeBuilderObject t = (TreeBuilderObject )type->tp_alloc(type, 0);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2070 if (t != NULL) {
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2071 t->root = NULL;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2072
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2073 Py_INCREF(Py_None);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2074 t->this = (ElementObject *)Py_None;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2075 Py_INCREF(Py_None);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2076 t->last = (ElementObject *)Py_None;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2077
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2078 t->data = NULL;
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2079 t->element_factory = NULL;
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2080 t->stack = PyList_New(20);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2081 if (!t->stack) {
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2082 Py_DECREF(t->this);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2083 Py_DECREF(t->last);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2084 return NULL;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2085 }
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2086 t->index = 0;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2087
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2088 t->events = NULL;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2089 t->start_event_obj = t->end_event_obj = NULL;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2090 t->start_ns_event_obj = t->end_ns_event_obj = NULL;
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2091 }
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2092 return (PyObject *)t;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2093 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2094
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2095 static int
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2096 treebuilder_init(PyObject self, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2097 {
77313 eb1d633fe307 Fix unterminated keyword array passed to PyArg_ParseTupleAndKeywords Eli Bendersky <eliben@gmail.com> parents: 77279 diff changeset	2098 static char *kwlist[] = {"element_factory", 0};
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2099 PyObject *element_factory = NULL;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2100 TreeBuilderObject self_tb = (TreeBuilderObject )self;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2101
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2102 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:TreeBuilder", kwlist,
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2103 &element_factory)) {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2104 return -1;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2105 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2106
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2107 if (element_factory) {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2108 Py_INCREF(element_factory);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2109 Py_XDECREF(self_tb->element_factory);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2110 self_tb->element_factory = element_factory;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2111 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2112
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2113 return 0;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2114 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2115
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2116 static int
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2117 treebuilder_gc_traverse(TreeBuilderObject self, visitproc visit, void arg)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2118 {
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2119 Py_VISIT(self->root);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2120 Py_VISIT(self->this);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2121 Py_VISIT(self->last);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2122 Py_VISIT(self->data);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2123 Py_VISIT(self->stack);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2124 Py_VISIT(self->element_factory);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2125 return 0;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2126 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2127
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2128 static int
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2129 treebuilder_gc_clear(TreeBuilderObject *self)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2130 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2131 Py_XDECREF(self->end_ns_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2132 Py_XDECREF(self->start_ns_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2133 Py_XDECREF(self->end_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2134 Py_XDECREF(self->start_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2135 Py_XDECREF(self->events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2136 Py_DECREF(self->stack);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2137 Py_XDECREF(self->data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2138 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2139 Py_DECREF(self->this);
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2140 Py_CLEAR(self->element_factory);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2141 Py_XDECREF(self->root);
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2142 return 0;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2143 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2144
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2145 static void
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2146 treebuilder_dealloc(TreeBuilderObject *self)
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2147 {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2148 PyObject_GC_UnTrack(self);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2149 treebuilder_gc_clear(self);
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2150 Py_TYPE(self)->tp_free((PyObject *)self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2151 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2152
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2153 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2154 /* handlers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2155
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2156 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2157 treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2158 PyObject* attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2159 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2160 PyObject* node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2161 PyObject* this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2162
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2163 if (self->data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2164 if (self->this == self->last) {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2165 Py_DECREF(JOIN_OBJ(self->last->text));
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2166 self->last->text = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2167 self->data, PyList_CheckExact(self->data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2168 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2169 } else {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2170 Py_DECREF(JOIN_OBJ(self->last->tail));
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2171 self->last->tail = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2172 self->data, PyList_CheckExact(self->data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2173 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2174 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2175 self->data = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2176 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2177
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2178 if (self->element_factory) {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2179 node = PyObject_CallFunction(self->element_factory, "OO", tag, attrib);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2180 } else {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2181 node = create_new_element(tag, attrib);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2182 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2183 if (!node) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2184 return NULL;
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2185 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2186
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2187 this = (PyObject*) self->this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2188
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2189 if (this != Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2190 if (element_add_subelement((ElementObject*) this, node) < 0)
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2191 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2192 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2193 if (self->root) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2194 PyErr_SetString(
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2195 elementtree_parseerror_obj,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2196 "multiple elements on top level"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2197 );
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2198 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2199 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2200 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2201 self->root = node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2202 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2203
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2204 if (self->index < PyList_GET_SIZE(self->stack)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2205 if (PyList_SetItem(self->stack, self->index, this) < 0)
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2206 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2207 Py_INCREF(this);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2208 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2209 if (PyList_Append(self->stack, this) < 0)
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2210 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2211 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2212 self->index++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2213
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2214 Py_DECREF(this);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2215 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2216 self->this = (ElementObject*) node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2217
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2218 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2219 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2220 self->last = (ElementObject*) node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2221
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2222 if (self->start_event_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2223 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2224 PyObject* action = self->start_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2225 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2226 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2227 Py_INCREF(action); PyTuple_SET_ITEM(res, 0, (PyObject*) action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2228 Py_INCREF(node); PyTuple_SET_ITEM(res, 1, (PyObject*) node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2229 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2230 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2231 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2232 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2233 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2234
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2235 return node;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2236
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2237 error:
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2238 Py_DECREF(node);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2239 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2240 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2241
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2242 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2243 treebuilder_handle_data(TreeBuilderObject* self, PyObject* data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2244 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2245 if (!self->data) {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2246 if (self->last == (ElementObject*) Py_None) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2247 /* ignore calls to data before the first call to start */
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2248 Py_RETURN_NONE;
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2249 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2250 /* store the first item as is */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2251 Py_INCREF(data); self->data = data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2252 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2253 /* more than one item; use a list to collect items */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2254 if (PyBytes_CheckExact(self->data) && Py_REFCNT(self->data) == 1 &&
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2255 PyBytes_CheckExact(data) && PyBytes_GET_SIZE(data) == 1) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2256 /* expat often generates single character data sections; handle
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2257 the most common case by resizing the existing string... */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2258 Py_ssize_t size = PyBytes_GET_SIZE(self->data);
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2259 if (_PyBytes_Resize(&self->data, size + 1) < 0)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2260 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2261 PyBytes_AS_STRING(self->data)[size] = PyBytes_AS_STRING(data)[0];
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2262 } else if (PyList_CheckExact(self->data)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2263 if (PyList_Append(self->data, data) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2264 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2265 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2266 PyObject* list = PyList_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2267 if (!list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2268 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2269 PyList_SET_ITEM(list, 0, self->data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2270 Py_INCREF(data); PyList_SET_ITEM(list, 1, data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2271 self->data = list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2272 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2273 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2274
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2275 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2276 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2277
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2278 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2279 treebuilder_handle_end(TreeBuilderObject* self, PyObject* tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2280 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2281 PyObject* item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2282
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2283 if (self->data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2284 if (self->this == self->last) {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2285 Py_DECREF(JOIN_OBJ(self->last->text));
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2286 self->last->text = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2287 self->data, PyList_CheckExact(self->data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2288 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2289 } else {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2290 Py_DECREF(JOIN_OBJ(self->last->tail));
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2291 self->last->tail = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2292 self->data, PyList_CheckExact(self->data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2293 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2294 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2295 self->data = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2296 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2297
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2298 if (self->index == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2299 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2300 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2301 "pop from empty stack"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2302 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2303 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2304 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2305
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2306 self->index--;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2307
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2308 item = PyList_GET_ITEM(self->stack, self->index);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2309 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2310
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2311 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2312
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2313 self->last = (ElementObject*) self->this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2314 self->this = (ElementObject*) item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2315
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2316 if (self->end_event_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2317 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2318 PyObject* action = self->end_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2319 PyObject* node = (PyObject*) self->last;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2320 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2321 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2322 Py_INCREF(action); PyTuple_SET_ITEM(res, 0, (PyObject*) action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2323 Py_INCREF(node); PyTuple_SET_ITEM(res, 1, (PyObject*) node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2324 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2325 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2326 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2327 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2328 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2329
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2330 Py_INCREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2331 return (PyObject*) self->last;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2332 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2333
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2334 LOCAL(void)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2335 treebuilder_handle_namespace(TreeBuilderObject* self, int start,
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2336 PyObject prefix, PyObject uri)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2337 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2338 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2339 PyObject* action;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2340 PyObject* parcel;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2341
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2342 if (!self->events)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2343 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2344
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2345 if (start) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2346 if (!self->start_ns_event_obj)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2347 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2348 action = self->start_ns_event_obj;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2349 parcel = Py_BuildValue("OO", prefix, uri);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2350 if (!parcel)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2351 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2352 Py_INCREF(action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2353 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2354 if (!self->end_ns_event_obj)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2355 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2356 action = self->end_ns_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2357 Py_INCREF(action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2358 parcel = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2359 Py_INCREF(parcel);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2360 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2361
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2362 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2363
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2364 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2365 PyTuple_SET_ITEM(res, 0, action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2366 PyTuple_SET_ITEM(res, 1, parcel);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2367 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2368 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2369 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2370 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2371 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2372
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2373 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2374 /* methods (in alphabetical order) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2375
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2376 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2377 treebuilder_data(TreeBuilderObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2378 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2379 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2380 if (!PyArg_ParseTuple(args, "O:data", &data))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2381 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2382
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2383 return treebuilder_handle_data(self, data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2384 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2385
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2386 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2387 treebuilder_end(TreeBuilderObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2388 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2389 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2390 if (!PyArg_ParseTuple(args, "O:end", &tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2391 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2392
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2393 return treebuilder_handle_end(self, tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2394 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2395
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2396 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2397 treebuilder_done(TreeBuilderObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2398 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2399 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2400
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2401 /* FIXME: check stack size? */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2402
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2403 if (self->root)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2404 res = self->root;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2405 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2406 res = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2407
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2408 Py_INCREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2409 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2410 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2411
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2412 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2413 treebuilder_close(TreeBuilderObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2414 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2415 if (!PyArg_ParseTuple(args, ":close"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2416 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2417
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2418 return treebuilder_done(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2419 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2420
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2421 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2422 treebuilder_start(TreeBuilderObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2423 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2424 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2425 PyObject* attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2426 if (!PyArg_ParseTuple(args, "O\|O:start", &tag, &attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2427 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2428
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2429 return treebuilder_handle_start(self, tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2430 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2431
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2432 static PyMethodDef treebuilder_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2433 {"data", (PyCFunction) treebuilder_data, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2434 {"start", (PyCFunction) treebuilder_start, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2435 {"end", (PyCFunction) treebuilder_end, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2436 {"close", (PyCFunction) treebuilder_close, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2437 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2438 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2439
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	2440 static PyTypeObject TreeBuilder_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	2441 PyVarObject_HEAD_INIT(NULL, 0)
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	2442 "TreeBuilder", sizeof(TreeBuilderObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2443 /* methods */
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2444 (destructor)treebuilder_dealloc, /* tp_dealloc */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2445 0, /* tp_print */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2446 0, /* tp_getattr */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2447 0, /* tp_setattr */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2448 0, /* tp_reserved */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2449 0, /* tp_repr */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2450 0, /* tp_as_number */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2451 0, /* tp_as_sequence */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2452 0, /* tp_as_mapping */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2453 0, /* tp_hash */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2454 0, /* tp_call */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2455 0, /* tp_str */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2456 0, /* tp_getattro */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2457 0, /* tp_setattro */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2458 0, /* tp_as_buffer */
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2459 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2460 /* tp_flags */
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2461 0, /* tp_doc */
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2462 (traverseproc)treebuilder_gc_traverse, /* tp_traverse */
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2463 (inquiry)treebuilder_gc_clear, /* tp_clear */
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2464 0, /* tp_richcompare */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2465 0, /* tp_weaklistoffset */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2466 0, /* tp_iter */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2467 0, /* tp_iternext */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2468 treebuilder_methods, /* tp_methods */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2469 0, /* tp_members */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2470 0, /* tp_getset */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2471 0, /* tp_base */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2472 0, /* tp_dict */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2473 0, /* tp_descr_get */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2474 0, /* tp_descr_set */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2475 0, /* tp_dictoffset */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2476 (initproc)treebuilder_init, /* tp_init */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2477 PyType_GenericAlloc, /* tp_alloc */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2478 treebuilder_new, /* tp_new */
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	2479 0, /* tp_free */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2480 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2481
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2482 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2483 /* the expat interface */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2484
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2485 #if defined(USE_EXPAT)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2486
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2487 #include "expat.h"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2488 #include "pyexpat.h"
77278 cf9c379a9859 We're always building _elementtree with USE_PYEXPAT_CAPI, so the #ifdefs in Eli Bendersky <eliben@gmail.com> parents: 77275 diff changeset	2489 static struct PyExpat_CAPI *expat_capi;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2490 #define EXPAT(func) (expat_capi->func)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2491
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2492 static XML_Memory_Handling_Suite ExpatMemoryHandler = {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2493 PyObject_Malloc, PyObject_Realloc, PyObject_Free};
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2494
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2495 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2496 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2497
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2498 XML_Parser parser;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2499
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2500 PyObject *target;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2501 PyObject *entity;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2502
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2503 PyObject *names;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2504
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2505 PyObject *handle_start;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2506 PyObject *handle_data;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2507 PyObject *handle_end;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2508
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2509 PyObject *handle_comment;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2510 PyObject *handle_pi;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2511 PyObject *handle_doctype;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2512
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2513 PyObject *handle_close;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2514
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2515 } XMLParserObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2516
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	2517 static PyTypeObject XMLParser_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2518
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2519 #define XMLParser_CheckExact(op) (Py_TYPE(op) == &XMLParser_Type)
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2520
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2521 /* helpers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2522
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2523 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2524 makeuniversal(XMLParserObject* self, const char* string)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2525 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2526 /* convert a UTF-8 tag/attribute name from the expat parser
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2527 to a universal name string */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2528
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2529 int size = strlen(string);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2530 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2531 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2532
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2533 /* look the 'raw' name up in the names dictionary */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2534 key = PyBytes_FromStringAndSize(string, size);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2535 if (!key)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2536 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2537
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2538 value = PyDict_GetItem(self->names, key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2539
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2540 if (value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2541 Py_INCREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2542 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2543 /* new name. convert to universal name, and decode as
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2544 necessary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2545
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2546 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2547 char* p;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2548 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2549
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2550 /* look for namespace separator */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2551 for (i = 0; i < size; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2552 if (string[i] == '}')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2553 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2554 if (i != size) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2555 /* convert to universal name */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2556 tag = PyBytes_FromStringAndSize(NULL, size+1);
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2557 p = PyBytes_AS_STRING(tag);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2558 p[0] = '{';
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2559 memcpy(p+1, string, size);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2560 size++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2561 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2562 /* plain name; use key as tag */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2563 Py_INCREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2564 tag = key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2565 }
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	2566
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2567 /* decode universal name */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	2568 p = PyBytes_AS_STRING(tag);
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2569 value = PyUnicode_DecodeUTF8(p, size, "strict");
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2570 Py_DECREF(tag);
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2571 if (!value) {
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2572 Py_DECREF(key);
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2573 return NULL;
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2574 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2575
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2576 /* add to names dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2577 if (PyDict_SetItem(self->names, key, value) < 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2578 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2579 Py_DECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2580 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2581 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2582 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2583
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2584 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2585 return value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2586 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2587
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2588 /* Set the ParseError exception with the given parameters.
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2589 * If message is not NULL, it's used as the error string. Otherwise, the
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2590 * message string is the default for the given error_code.
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2591 */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2592 static void
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2593 expat_set_error(enum XML_Error error_code, int line, int column, char *message)
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2594 {
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2595 PyObject errmsg, error, position, code;
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2596
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2597 errmsg = PyUnicode_FromFormat("%s: line %d, column %d",
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2598 message ? message : EXPAT(ErrorString)(error_code),
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2599 line, column);
68805 74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2600 if (errmsg == NULL)
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2601 return;
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2602
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2603 error = PyObject_CallFunction(elementtree_parseerror_obj, "O", errmsg);
74d3dc78f0db Issue #10833: Use PyUnicode_FromFormat() and PyErr_Format() instead of Victor Stinner <victor.stinner@haypocalc.com> parents: 68804 diff changeset	2604 Py_DECREF(errmsg);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2605 if (!error)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2606 return;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2607
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2608 /* Add code and position attributes */
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2609 code = PyLong_FromLong((long)error_code);
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2610 if (!code) {
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2611 Py_DECREF(error);
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2612 return;
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2613 }
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2614 if (PyObject_SetAttrString(error, "code", code) == -1) {
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2615 Py_DECREF(error);
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2616 Py_DECREF(code);
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2617 return;
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2618 }
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2619 Py_DECREF(code);
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2620
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2621 position = Py_BuildValue("(ii)", line, column);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2622 if (!position) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2623 Py_DECREF(error);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2624 return;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2625 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2626 if (PyObject_SetAttrString(error, "position", position) == -1) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2627 Py_DECREF(error);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2628 Py_DECREF(position);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2629 return;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2630 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2631 Py_DECREF(position);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2632
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2633 PyErr_SetObject(elementtree_parseerror_obj, error);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2634 Py_DECREF(error);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2635 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2636
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2637 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2638 /* handlers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2639
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2640 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2641 expat_default_handler(XMLParserObject* self, const XML_Char* data_in,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2642 int data_len)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2643 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2644 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2645 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2646 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2647
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2648 if (data_len < 2 \|\| data_in[0] != '&')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2649 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2650
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2651 key = PyUnicode_DecodeUTF8(data_in + 1, data_len - 2, "strict");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2652 if (!key)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2653 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2654
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2655 value = PyDict_GetItem(self->entity, key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2656
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2657 if (value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2658 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2659 res = treebuilder_handle_data(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2660 (TreeBuilderObject*) self->target, value
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2661 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2662 else if (self->handle_data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2663 res = PyObject_CallFunction(self->handle_data, "O", value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2664 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2665 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2666 Py_XDECREF(res);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2667 } else if (!PyErr_Occurred()) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2668 /* Report the first error, not the last */
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	2669 char message[128] = "undefined entity ";
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	2670 strncat(message, data_in, data_len < 100?data_len:100);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2671 expat_set_error(
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2672 XML_ERROR_UNDEFINED_ENTITY,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2673 EXPAT(GetErrorLineNumber)(self->parser),
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2674 EXPAT(GetErrorColumnNumber)(self->parser),
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	2675 message
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2676 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2677 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2678
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2679 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2680 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2681
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2682 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2683 expat_start_handler(XMLParserObject* self, const XML_Char* tag_in,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2684 const XML_Char **attrib_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2685 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2686 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2687 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2688 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2689 int ok;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2690
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2691 /* tag name */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2692 tag = makeuniversal(self, tag_in);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2693 if (!tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2694 return; /* parser will look for errors */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2695
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2696 /* attributes */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2697 if (attrib_in[0]) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2698 attrib = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2699 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2700 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2701 while (attrib_in[0] && attrib_in[1]) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2702 PyObject* key = makeuniversal(self, attrib_in[0]);
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2703 PyObject* value = PyUnicode_DecodeUTF8(attrib_in[1], strlen(attrib_in[1]), "strict");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2704 if (!key \|\| !value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2705 Py_XDECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2706 Py_XDECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2707 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2708 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2709 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2710 ok = PyDict_SetItem(attrib, key, value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2711 Py_DECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2712 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2713 if (ok < 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2714 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2715 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2716 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2717 attrib_in += 2;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2718 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2719 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2720 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2721 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2722 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2723
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2724 /* If we get None, pass an empty dictionary on */
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2725 if (attrib == Py_None) {
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2726 Py_DECREF(attrib);
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2727 attrib = PyDict_New();
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2728 if (!attrib)
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2729 return;
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2730 }
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2731
20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2732 if (TreeBuilder_CheckExact(self->target)) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2733 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2734 res = treebuilder_handle_start((TreeBuilderObject*) self->target,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2735 tag, attrib);
77246 20b8f0ee3d64 Issue #14007: implemented the 'element_factory' feature of TreeBuilder in Eli Bendersky <eliben@gmail.com> parents: 77226 diff changeset	2736 }
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2737 else if (self->handle_start) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2738 res = PyObject_CallFunction(self->handle_start, "OO", tag, attrib);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2739 } else
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2740 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2741
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2742 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2743 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2744
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2745 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2746 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2747
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2748 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2749 expat_data_handler(XMLParserObject* self, const XML_Char* data_in,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2750 int data_len)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2751 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2752 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2753 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2754
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2755 data = PyUnicode_DecodeUTF8(data_in, data_len, "strict");
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2756 if (!data)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2757 return; /* parser will look for errors */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2758
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2759 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2760 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2761 res = treebuilder_handle_data((TreeBuilderObject*) self->target, data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2762 else if (self->handle_data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2763 res = PyObject_CallFunction(self->handle_data, "O", data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2764 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2765 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2766
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2767 Py_DECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2768
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2769 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2770 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2771
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2772 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2773 expat_end_handler(XMLParserObject* self, const XML_Char* tag_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2774 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2775 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2776 PyObject* res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2777
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2778 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2779 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2780 /* the standard tree builder doesn't look at the end tag */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2781 res = treebuilder_handle_end(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2782 (TreeBuilderObject*) self->target, Py_None
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2783 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2784 else if (self->handle_end) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2785 tag = makeuniversal(self, tag_in);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2786 if (tag) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2787 res = PyObject_CallFunction(self->handle_end, "O", tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2788 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2789 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2790 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2791
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2792 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2793 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2794
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2795 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2796 expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2797 const XML_Char *uri)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2798 {
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2799 PyObject* sprefix = NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2800 PyObject* suri = NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2801
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2802 suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2803 if (!suri)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2804 return;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2805
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2806 if (prefix)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2807 sprefix = PyUnicode_DecodeUTF8(prefix, strlen(prefix), "strict");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2808 else
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2809 sprefix = PyUnicode_FromString("");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2810 if (!sprefix) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2811 Py_DECREF(suri);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2812 return;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2813 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2814
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2815 treebuilder_handle_namespace(
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2816 (TreeBuilderObject*) self->target, 1, sprefix, suri
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2817 );
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2818
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2819 Py_DECREF(sprefix);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2820 Py_DECREF(suri);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2821 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2822
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2823 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2824 expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2825 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2826 treebuilder_handle_namespace(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2827 (TreeBuilderObject*) self->target, 0, NULL, NULL
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2828 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2829 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2830
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2831 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2832 expat_comment_handler(XMLParserObject* self, const XML_Char* comment_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2833 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2834 PyObject* comment;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2835 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2836
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2837 if (self->handle_comment) {
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2838 comment = PyUnicode_DecodeUTF8(comment_in, strlen(comment_in), "strict");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2839 if (comment) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2840 res = PyObject_CallFunction(self->handle_comment, "O", comment);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2841 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2842 Py_DECREF(comment);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2843 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2844 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2845 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2846
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2847 static void
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2848 expat_start_doctype_handler(XMLParserObject *self,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2849 const XML_Char *doctype_name,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2850 const XML_Char *sysid,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2851 const XML_Char *pubid,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2852 int has_internal_subset)
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2853 {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2854 PyObject self_pyobj = (PyObject )self;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2855 PyObject doctype_name_obj, sysid_obj, *pubid_obj;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2856 PyObject *parser_doctype = NULL;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2857 PyObject *res = NULL;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2858
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2859 doctype_name_obj = makeuniversal(self, doctype_name);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2860 if (!doctype_name_obj)
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2861 return;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2862
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2863 if (sysid) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2864 sysid_obj = makeuniversal(self, sysid);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2865 if (!sysid_obj) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2866 Py_DECREF(doctype_name_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2867 return;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2868 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2869 } else {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2870 Py_INCREF(Py_None);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2871 sysid_obj = Py_None;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2872 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2873
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2874 if (pubid) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2875 pubid_obj = makeuniversal(self, pubid);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2876 if (!pubid_obj) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2877 Py_DECREF(doctype_name_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2878 Py_DECREF(sysid_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2879 return;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2880 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2881 } else {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2882 Py_INCREF(Py_None);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2883 pubid_obj = Py_None;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2884 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2885
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2886 /* If the target has a handler for doctype, call it. */
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2887 if (self->handle_doctype) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2888 res = PyObject_CallFunction(self->handle_doctype, "OOO",
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2889 doctype_name_obj, pubid_obj, sysid_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2890 Py_CLEAR(res);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2891 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2892
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2893 /* Now see if the parser itself has a doctype method. If yes and it's
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2894 * a subclass, call it but warn about deprecation. If it's not a subclass
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2895 * (i.e. vanilla XMLParser), do nothing.
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2896 */
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2897 parser_doctype = PyObject_GetAttrString(self_pyobj, "doctype");
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2898 if (parser_doctype) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2899 if (!XMLParser_CheckExact(self_pyobj)) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2900 if (PyErr_WarnEx(PyExc_DeprecationWarning,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2901 "This method of XMLParser is deprecated. Define"
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2902 " doctype() method on the TreeBuilder target.",
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2903 1) < 0) {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2904 goto clear;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2905 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2906 res = PyObject_CallFunction(parser_doctype, "OOO",
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2907 doctype_name_obj, pubid_obj, sysid_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2908 Py_CLEAR(res);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2909 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2910 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2911
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2912 clear:
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2913 Py_XDECREF(parser_doctype);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2914 Py_DECREF(doctype_name_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2915 Py_DECREF(pubid_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2916 Py_DECREF(sysid_obj);
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2917 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2918
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2919 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2920 expat_pi_handler(XMLParserObject* self, const XML_Char* target_in,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2921 const XML_Char* data_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2922 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2923 PyObject* target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2924 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2925 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2926
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2927 if (self->handle_pi) {
42491 a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2928 target = PyUnicode_DecodeUTF8(target_in, strlen(target_in), "strict");
a8f13a43eaa1 SF patch # 1769767, get test_xml_etree_c working. More conversions are probably needed. Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	2929 data = PyUnicode_DecodeUTF8(data_in, strlen(data_in), "strict");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2930 if (target && data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2931 res = PyObject_CallFunction(self->handle_pi, "OO", target, data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2932 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2933 Py_DECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2934 Py_DECREF(target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2935 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2936 Py_XDECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2937 Py_XDECREF(target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2938 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2939 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2940 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2941
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2942 static int
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2943 expat_unknown_encoding_handler(XMLParserObject self, const XML_Char name,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2944 XML_Encoding *info)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2945 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2946 PyObject* u;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2947 unsigned char s[256];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2948 int i;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2949 void *data;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2950 unsigned int kind;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2951
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2952 memset(info, 0, sizeof(XML_Encoding));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2953
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2954 for (i = 0; i < 256; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2955 s[i] = i;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	2956
36117 7d6ab9f39996 SF#1389809 Fredrik Lundh <fredrik@pythonware.com> parents: 36083 diff changeset	2957 u = PyUnicode_Decode((char*) s, 256, name, "replace");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2958 if (!u)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2959 return XML_STATUS_ERROR;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2960 if (PyUnicode_READY(u))
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2961 return XML_STATUS_ERROR;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2962
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2963 if (PyUnicode_GET_LENGTH(u) != 256) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2964 Py_DECREF(u);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2965 return XML_STATUS_ERROR;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2966 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2967
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2968 kind = PyUnicode_KIND(u);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2969 data = PyUnicode_DATA(u);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2970 for (i = 0; i < 256; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2971 Py_UCS4 ch = PyUnicode_READ(kind, data, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2972 if (ch != Py_UNICODE_REPLACEMENT_CHARACTER)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 68805 diff changeset	2973 info->map[i] = ch;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2974 else
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	2975 info->map[i] = -1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2976 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2977
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2978 Py_DECREF(u);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2979
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2980 return XML_STATUS_OK;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2981 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2982
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2983 /* -------------------------------------------------------------------- */
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2984
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2985 static PyObject *
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2986 xmlparser_new(PyTypeObject type, PyObject args, PyObject *kwds)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2987 {
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2988 XMLParserObject self = (XMLParserObject )type->tp_alloc(type, 0);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2989 if (self) {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2990 self->parser = NULL;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2991 self->target = self->entity = self->names = NULL;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2992 self->handle_start = self->handle_data = self->handle_end = NULL;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2993 self->handle_comment = self->handle_pi = self->handle_close = NULL;
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	2994 self->handle_doctype = NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2995 }
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2996 return (PyObject *)self;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2997 }
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2998
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	2999 static int
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3000 xmlparser_init(PyObject self, PyObject args, PyObject *kwds)
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3001 {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3002 XMLParserObject self_xp = (XMLParserObject )self;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3003 PyObject target = NULL, html = NULL;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3004 char *encoding = NULL;
77313 eb1d633fe307 Fix unterminated keyword array passed to PyArg_ParseTupleAndKeywords Eli Bendersky <eliben@gmail.com> parents: 77279 diff changeset	3005 static char *kwlist[] = {"html", "target", "encoding", 0};
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3006
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3007 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|OOz:XMLParser", kwlist,
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3008 &html, &target, &encoding)) {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3009 return -1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3010 }
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	3011
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3012 self_xp->entity = PyDict_New();
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3013 if (!self_xp->entity)
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3014 return -1;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3015
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3016 self_xp->names = PyDict_New();
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3017 if (!self_xp->names) {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3018 Py_XDECREF(self_xp->entity);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3019 return -1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3020 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3021
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3022 self_xp->parser = EXPAT(ParserCreate_MM)(encoding, &ExpatMemoryHandler, "}");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3023 if (!self_xp->parser) {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3024 Py_XDECREF(self_xp->entity);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3025 Py_XDECREF(self_xp->names);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3026 PyErr_NoMemory();
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3027 return -1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3028 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3029
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3030 if (target) {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3031 Py_INCREF(target);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3032 } else {
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	3033 target = treebuilder_new(&TreeBuilder_Type, NULL, NULL);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3034 if (!target) {
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3035 Py_XDECREF(self_xp->entity);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3036 Py_XDECREF(self_xp->names);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3037 EXPAT(ParserFree)(self_xp->parser);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3038 return -1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3039 }
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3040 }
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3041 self_xp->target = target;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3042
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3043 self_xp->handle_start = PyObject_GetAttrString(target, "start");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3044 self_xp->handle_data = PyObject_GetAttrString(target, "data");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3045 self_xp->handle_end = PyObject_GetAttrString(target, "end");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3046 self_xp->handle_comment = PyObject_GetAttrString(target, "comment");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3047 self_xp->handle_pi = PyObject_GetAttrString(target, "pi");
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3048 self_xp->handle_close = PyObject_GetAttrString(target, "close");
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3049 self_xp->handle_doctype = PyObject_GetAttrString(target, "doctype");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3050
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3051 PyErr_Clear();
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3052
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3053 /* configure parser */
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3054 EXPAT(SetUserData)(self_xp->parser, self_xp);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3055 EXPAT(SetElementHandler)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3056 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3057 (XML_StartElementHandler) expat_start_handler,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3058 (XML_EndElementHandler) expat_end_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3059 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3060 EXPAT(SetDefaultHandlerExpand)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3061 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3062 (XML_DefaultHandler) expat_default_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3063 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3064 EXPAT(SetCharacterDataHandler)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3065 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3066 (XML_CharacterDataHandler) expat_data_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3067 );
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3068 if (self_xp->handle_comment)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3069 EXPAT(SetCommentHandler)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3070 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3071 (XML_CommentHandler) expat_comment_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3072 );
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3073 if (self_xp->handle_pi)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3074 EXPAT(SetProcessingInstructionHandler)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3075 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3076 (XML_ProcessingInstructionHandler) expat_pi_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3077 );
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3078 EXPAT(SetStartDoctypeDeclHandler)(
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3079 self_xp->parser,
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3080 (XML_StartDoctypeDeclHandler) expat_start_doctype_handler
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3081 );
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3082 EXPAT(SetUnknownEncodingHandler)(
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3083 self_xp->parser,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3084 (XML_UnknownEncodingHandler) expat_unknown_encoding_handler, NULL
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3085 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3086
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3087 return 0;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3088 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3089
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3090 static int
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3091 xmlparser_gc_traverse(XMLParserObject self, visitproc visit, void arg)
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3092 {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3093 Py_VISIT(self->handle_close);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3094 Py_VISIT(self->handle_pi);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3095 Py_VISIT(self->handle_comment);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3096 Py_VISIT(self->handle_end);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3097 Py_VISIT(self->handle_data);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3098 Py_VISIT(self->handle_start);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3099
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3100 Py_VISIT(self->target);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3101 Py_VISIT(self->entity);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3102 Py_VISIT(self->names);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3103
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3104 return 0;
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3105 }
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3106
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3107 static int
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3108 xmlparser_gc_clear(XMLParserObject *self)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3109 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3110 EXPAT(ParserFree)(self->parser);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3111
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3112 Py_XDECREF(self->handle_close);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3113 Py_XDECREF(self->handle_pi);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3114 Py_XDECREF(self->handle_comment);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3115 Py_XDECREF(self->handle_end);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3116 Py_XDECREF(self->handle_data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3117 Py_XDECREF(self->handle_start);
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3118 Py_XDECREF(self->handle_doctype);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3119
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3120 Py_XDECREF(self->target);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3121 Py_XDECREF(self->entity);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3122 Py_XDECREF(self->names);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3123
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3124 return 0;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3125 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3126
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3127 static void
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3128 xmlparser_dealloc(XMLParserObject* self)
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3129 {
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3130 PyObject_GC_UnTrack(self);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3131 xmlparser_gc_clear(self);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3132 Py_TYPE(self)->tp_free((PyObject *)self);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3133 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3134
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3135 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3136 expat_parse(XMLParserObject* self, char* data, int data_len, int final)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3137 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3138 int ok;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3139
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3140 ok = EXPAT(Parse)(self->parser, data, data_len, final);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3141
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3142 if (PyErr_Occurred())
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3143 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3144
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3145 if (!ok) {
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3146 expat_set_error(
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	3147 EXPAT(GetErrorCode)(self->parser),
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3148 EXPAT(GetErrorLineNumber)(self->parser),
75722 b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	3149 EXPAT(GetErrorColumnNumber)(self->parser),
b76fa310e73d Issue #14207: the ParseError exception raised by _elementtree was made Eli Bendersky <eliben@gmail.com> parents: 75721 diff changeset	3150 NULL
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3151 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3152 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3153 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3154
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3155 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3156 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3157
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3158 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3159 xmlparser_close(XMLParserObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3160 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3161 /* end feeding data to parser */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3162
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3163 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3164 if (!PyArg_ParseTuple(args, ":close"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3165 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3166
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3167 res = expat_parse(self, "", 0, 1);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3168 if (!res)
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3169 return NULL;
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3170
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3171 if (TreeBuilder_CheckExact(self->target)) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3172 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3173 return treebuilder_done((TreeBuilderObject*) self->target);
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3174 } if (self->handle_close) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3175 Py_DECREF(res);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3176 return PyObject_CallFunction(self->handle_close, "");
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3177 } else
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3178 return res;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3179 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3180
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3181 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3182 xmlparser_feed(XMLParserObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3183 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3184 /* feed data to parser */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3185
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3186 char* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3187 int data_len;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3188 if (!PyArg_ParseTuple(args, "s#:feed", &data, &data_len))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3189 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3190
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3191 return expat_parse(self, data, data_len, 0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3192 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3193
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3194 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3195 xmlparser_parse(XMLParserObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3196 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3197 /* (internal) parse until end of input stream */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3198
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3199 PyObject* reader;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3200 PyObject* buffer;
75721 7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3201 PyObject* temp;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3202 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3203
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3204 PyObject* fileobj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3205 if (!PyArg_ParseTuple(args, "O:_parse", &fileobj))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3206 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3207
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3208 reader = PyObject_GetAttrString(fileobj, "read");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3209 if (!reader)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3210 return NULL;
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	3211
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3212 /* read from open file object */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3213 for (;;) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3214
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3215 buffer = PyObject_CallFunction(reader, "i", 64*1024);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3216
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3217 if (!buffer) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3218 /* read failed (e.g. due to KeyboardInterrupt) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3219 Py_DECREF(reader);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3220 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3221 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3222
75721 7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3223 if (PyUnicode_CheckExact(buffer)) {
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3224 /* A unicode object is encoded into bytes using UTF-8 */
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3225 if (PyUnicode_GET_SIZE(buffer) == 0) {
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3226 Py_DECREF(buffer);
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3227 break;
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3228 }
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3229 temp = PyUnicode_AsEncodedString(buffer, "utf-8", "surrogatepass");
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3230 if (!temp) {
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3231 /* Propagate exception from PyUnicode_AsEncodedString */
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3232 Py_DECREF(buffer);
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3233 Py_DECREF(reader);
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3234 return NULL;
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3235 }
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3236
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3237 /* Here we no longer need the original buffer since it contains
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3238 * unicode. Make it point to the encoded bytes object.
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3239 */
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3240 Py_DECREF(buffer);
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3241 buffer = temp;
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3242 }
7bdf5c96fdc0 Closes Issue #14246: _elementtree parser will now handle io.StringIO Eli Bendersky <eliben@gmail.com> parents: 75505 diff changeset	3243 else if (!PyBytes_CheckExact(buffer) \|\| PyBytes_GET_SIZE(buffer) == 0) {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3244 Py_DECREF(buffer);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3245 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3246 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3247
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3248 res = expat_parse(
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	3249 self, PyBytes_AS_STRING(buffer), PyBytes_GET_SIZE(buffer), 0
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3250 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3251
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3252 Py_DECREF(buffer);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3253
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3254 if (!res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3255 Py_DECREF(reader);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3256 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3257 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3258 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3259
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3260 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3261
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3262 Py_DECREF(reader);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3263
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3264 res = expat_parse(self, "", 0, 1);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3265
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3266 if (res && TreeBuilder_CheckExact(self->target)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3267 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3268 return treebuilder_done((TreeBuilderObject*) self->target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3269 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3270
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3271 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3272 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3273
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3274 static PyObject*
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3275 xmlparser_doctype(XMLParserObject self, PyObject args)
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3276 {
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3277 Py_RETURN_NONE;
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3278 }
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3279
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3280 static PyObject*
6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3281 xmlparser_setevents(XMLParserObject self, PyObject args)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3282 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3283 /* activate element event reporting */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3284
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3285 Py_ssize_t i;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3286 TreeBuilderObject* target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3287
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3288 PyObject* events; /* event collector */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3289 PyObject* event_set = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3290 if (!PyArg_ParseTuple(args, "O!\|O:_setevents", &PyList_Type, &events,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3291 &event_set))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3292 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3293
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3294 if (!TreeBuilder_CheckExact(self->target)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3295 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3296 PyExc_TypeError,
74903 65fc79fb4eb2 Issue #13988: cElementTree is deprecated and the _elementtree accelerator is automatically used whenever available. Florent Xicluna <florent.xicluna@gmail.com> parents: 74870 diff changeset	3297 "event handling only supported for ElementTree.TreeBuilder "
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3298 "targets"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3299 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3300 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3301 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3302
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3303 target = (TreeBuilderObject*) self->target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3304
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3305 Py_INCREF(events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3306 Py_XDECREF(target->events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3307 target->events = events;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3308
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3309 /* clear out existing events */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3310 Py_XDECREF(target->start_event_obj); target->start_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3311 Py_XDECREF(target->end_event_obj); target->end_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3312 Py_XDECREF(target->start_ns_event_obj); target->start_ns_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3313 Py_XDECREF(target->end_ns_event_obj); target->end_ns_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3314
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3315 if (event_set == Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3316 /* default is "end" only */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3317 target->end_event_obj = PyUnicode_FromString("end");
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3318 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3319 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3320
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3321 if (!PyTuple_Check(event_set)) /* FIXME: handle arbitrary sequences */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3322 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3323
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3324 for (i = 0; i < PyTuple_GET_SIZE(event_set); i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3325 PyObject* item = PyTuple_GET_ITEM(event_set, i);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3326 char* event;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3327 if (PyUnicode_Check(item)) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3328 event = _PyUnicode_AsString(item);
59893 2d6178480cc7 Fix a crash in _elementtree related to lone unicode surrogates. Victor Stinner <victor.stinner@haypocalc.com> parents: 59601 diff changeset	3329 if (event == NULL)
2d6178480cc7 Fix a crash in _elementtree related to lone unicode surrogates. Victor Stinner <victor.stinner@haypocalc.com> parents: 59601 diff changeset	3330 goto error;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3331 } else if (PyBytes_Check(item))
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3332 event = PyBytes_AS_STRING(item);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3333 else {
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3334 goto error;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3335 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3336 if (strcmp(event, "start") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3337 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3338 target->start_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3339 } else if (strcmp(event, "end") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3340 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3341 Py_XDECREF(target->end_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3342 target->end_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3343 } else if (strcmp(event, "start-ns") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3344 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3345 Py_XDECREF(target->start_ns_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3346 target->start_ns_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3347 EXPAT(SetNamespaceDeclHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3348 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3349 (XML_StartNamespaceDeclHandler) expat_start_ns_handler,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3350 (XML_EndNamespaceDeclHandler) expat_end_ns_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3351 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3352 } else if (strcmp(event, "end-ns") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3353 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3354 Py_XDECREF(target->end_ns_event_obj);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3355 target->end_ns_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3356 EXPAT(SetNamespaceDeclHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3357 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3358 (XML_StartNamespaceDeclHandler) expat_start_ns_handler,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3359 (XML_EndNamespaceDeclHandler) expat_end_ns_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3360 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3361 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3362 PyErr_Format(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3363 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3364 "unknown event '%s'", event
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3365 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3366 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3367 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3368 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3369
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3370 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3371
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3372 error:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3373 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3374 PyExc_TypeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3375 "invalid event tuple"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3376 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3377 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3378 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3379
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3380 static PyMethodDef xmlparser_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3381 {"feed", (PyCFunction) xmlparser_feed, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3382 {"close", (PyCFunction) xmlparser_close, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3383 {"_parse", (PyCFunction) xmlparser_parse, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3384 {"_setevents", (PyCFunction) xmlparser_setevents, METH_VARARGS},
77279 6f9bfcc1896f Issue #14007: implement doctype() method calling in XMLParser of _elementtree. Eli Bendersky <eliben@gmail.com> parents: 77278 diff changeset	3385 {"doctype", (PyCFunction) xmlparser_doctype, METH_VARARGS},
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3386 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3387 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3388
68804 d0fe7489c4cc _elementtree.c: remove trailing spaces Victor Stinner <victor.stinner@haypocalc.com> parents: 66799 diff changeset	3389 static PyObject*
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3390 xmlparser_getattro(XMLParserObject* self, PyObject* nameobj)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3391 {
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3392 if (PyUnicode_Check(nameobj)) {
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3393 PyObject* res;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3394 if (PyUnicode_CompareWithASCIIString(nameobj, "entity") == 0)
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3395 res = self->entity;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3396 else if (PyUnicode_CompareWithASCIIString(nameobj, "target") == 0)
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3397 res = self->target;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3398 else if (PyUnicode_CompareWithASCIIString(nameobj, "version") == 0) {
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3399 return PyUnicode_FromFormat(
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3400 "Expat %d.%d.%d", XML_MAJOR_VERSION,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3401 XML_MINOR_VERSION, XML_MICRO_VERSION);
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3402 }
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3403 else
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3404 goto generic;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3405
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3406 Py_INCREF(res);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3407 return res;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3408 }
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3409 generic:
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66664 diff changeset	3410 return PyObject_GenericGetAttr((PyObject*) self, nameobj);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3411 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3412
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	3413 static PyTypeObject XMLParser_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	3414 PyVarObject_HEAD_INIT(NULL, 0)
e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41782 diff changeset	3415 "XMLParser", sizeof(XMLParserObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3416 /* methods */
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3417 (destructor)xmlparser_dealloc, /* tp_dealloc */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3418 0, /* tp_print */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3419 0, /* tp_getattr */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3420 0, /* tp_setattr */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3421 0, /* tp_reserved */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3422 0, /* tp_repr */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3423 0, /* tp_as_number */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3424 0, /* tp_as_sequence */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3425 0, /* tp_as_mapping */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3426 0, /* tp_hash */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3427 0, /* tp_call */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3428 0, /* tp_str */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3429 (getattrofunc)xmlparser_getattro, /* tp_getattro */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3430 0, /* tp_setattro */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3431 0, /* tp_as_buffer */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3432 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3433 /* tp_flags */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3434 0, /* tp_doc */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3435 (traverseproc)xmlparser_gc_traverse, /* tp_traverse */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3436 (inquiry)xmlparser_gc_clear, /* tp_clear */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3437 0, /* tp_richcompare */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3438 0, /* tp_weaklistoffset */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3439 0, /* tp_iter */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3440 0, /* tp_iternext */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3441 xmlparser_methods, /* tp_methods */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3442 0, /* tp_members */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3443 0, /* tp_getset */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3444 0, /* tp_base */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3445 0, /* tp_dict */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3446 0, /* tp_descr_get */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3447 0, /* tp_descr_set */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3448 0, /* tp_dictoffset */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3449 (initproc)xmlparser_init, /* tp_init */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3450 PyType_GenericAlloc, /* tp_alloc */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3451 xmlparser_new, /* tp_new */
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3452 0, /* tp_free */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3453 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3454
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3455 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3456
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3457 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3458 /* python module interface */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3459
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3460 static PyMethodDef _functions[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3461 {"SubElement", (PyCFunction) subelement, METH_VARARGS\|METH_KEYWORDS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3462 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3463 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3464
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3465
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3466 static struct PyModuleDef _elementtreemodule = {
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3467 PyModuleDef_HEAD_INIT,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3468 "_elementtree",
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3469 NULL,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3470 -1,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3471 _functions,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3472 NULL,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3473 NULL,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3474 NULL,
9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3475 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3476 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3477
40528 bce7e4a926a9 Cruft removal: Neal Norwitz <nnorwitz@gmail.com> parents: 39610 diff changeset	3478 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3479 PyInit__elementtree(void)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3480 {
77431 652d148bdc1d Replace the iter/itertext methods of Element in _elementtree with true C implementations, instead of the bootstrapped Python code. In addition to being cleaner (removing the last remains of the bootstrapping code in _elementtree), this gives a 10x performance boost for iter() on large documents. Eli Bendersky <eliben@gmail.com> parents: 77313 diff changeset	3481 PyObject m, temp;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3482
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3483 /* Initialize object types */
4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3484 if (PyType_Ready(&TreeBuilder_Type) < 0)
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3485 return NULL;
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3486 if (PyType_Ready(&Element_Type) < 0)
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3487 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3488 #if defined(USE_EXPAT)
48414 4025f638911f #3247: Get rid of Py_FindMethod: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3489 if (PyType_Ready(&XMLParser_Type) < 0)
63924 9108e7dcd7d8 Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99 Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 59893 diff changeset	3490 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3491 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3492
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3493 m = PyModule_Create(&_elementtreemodule);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	3494 if (!m)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3495 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3496
76110 1ddf58262706 Replace bootstrap imports with real C API calls. Eli Bendersky <eliben@gmail.com> parents: 76101 diff changeset	3497 if (!(temp = PyImport_ImportModule("copy")))
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3498 return NULL;
76110 1ddf58262706 Replace bootstrap imports with real C API calls. Eli Bendersky <eliben@gmail.com> parents: 76101 diff changeset	3499 elementtree_deepcopy_obj = PyObject_GetAttrString(temp, "deepcopy");
1ddf58262706 Replace bootstrap imports with real C API calls. Eli Bendersky <eliben@gmail.com> parents: 76101 diff changeset	3500 Py_XDECREF(temp);
1ddf58262706 Replace bootstrap imports with real C API calls. Eli Bendersky <eliben@gmail.com> parents: 76101 diff changeset	3501
1ddf58262706 Replace bootstrap imports with real C API calls. Eli Bendersky <eliben@gmail.com> parents: 76101 diff changeset	3502 if (!(elementpath_obj = PyImport_ImportModule("xml.etree.ElementPath")))
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3503 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3504
77278 cf9c379a9859 We're always building _elementtree with USE_PYEXPAT_CAPI, so the #ifdefs in Eli Bendersky <eliben@gmail.com> parents: 77275 diff changeset	3505 /* link against pyexpat */
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3506 expat_capi = PyCapsule_Import(PyExpat_CAPSULE_NAME, 0);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3507 if (expat_capi) {
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3508 /* check that it's usable */
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3509 if (strcmp(expat_capi->magic, PyExpat_CAPI_MAGIC) != 0 \|\|
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3510 expat_capi->size < sizeof(struct PyExpat_CAPI) \|\|
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3511 expat_capi->MAJOR_VERSION != XML_MAJOR_VERSION \|\|
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3512 expat_capi->MINOR_VERSION != XML_MINOR_VERSION \|\|
78220 c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3513 expat_capi->MICRO_VERSION != XML_MICRO_VERSION) {
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3514 PyErr_SetString(PyExc_ImportError,
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3515 "pyexpat version is incompatible");
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3516 return NULL;
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3517 }
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3518 } else {
c8534d55c5e6 Raise ImportError if pyexpat's version is incompatible Eli Bendersky <eliben@gmail.com> parents: 78152 diff changeset	3519 return NULL;
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3520 }
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3521
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3522 elementtree_parseerror_obj = PyErr_NewException(
74903 65fc79fb4eb2 Issue #13988: cElementTree is deprecated and the _elementtree accelerator is automatically used whenever available. Florent Xicluna <florent.xicluna@gmail.com> parents: 74870 diff changeset	3523 "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL
59601 7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3524 );
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3525 Py_INCREF(elementtree_parseerror_obj);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3526 PyModule_AddObject(m, "ParseError", elementtree_parseerror_obj);
7a18c2762886 Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from Florent Xicluna <florent.xicluna@gmail.com> parents: 53816 diff changeset	3527
75379 ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	3528 Py_INCREF((PyObject *)&Element_Type);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	3529 PyModule_AddObject(m, "Element", (PyObject *)&Element_Type);
ce1c26cbe5fb Issue #14128: Exposing Element as an actual type from _elementtree, rather than a factory function. Eli Bendersky <eliben@gmail.com> parents: 74903 diff changeset	3530
77226 717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	3531 Py_INCREF((PyObject *)&TreeBuilder_Type);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	3532 PyModule_AddObject(m, "TreeBuilder", (PyObject *)&TreeBuilder_Type);
717632ae7b3f Issue #14007: make TreeBuilder an actual type exposed from _elementtree, and subclassable. Eli Bendersky <eliben@gmail.com> parents: 77217 diff changeset	3533
77275 a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3534 #if defined(USE_EXPAT)
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3535 Py_INCREF((PyObject *)&XMLParser_Type);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3536 PyModule_AddObject(m, "XMLParser", (PyObject *)&XMLParser_Type);
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3537 #endif
a29ae1c2b8b2 Issue #14007: make XMLParser a real subclassable type exported from _elementtree. +cleanups Eli Bendersky <eliben@gmail.com> parents: 77246 diff changeset	3538
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3539 return m;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	3540 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_elementtree.c @ 79005:2fa7c104f909