cpython-lru_cache-weakref: Modules/

annotate Modules/_elementtree.c @ 46567:ffeecbebf3ca

Block 2.6-only doc change.

author	Georg Brandl <georg@python.org>
date	Sat, 26 Apr 2008 18:28:08 +0000
parents	14d4104976fc
children	23ab586c427a

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
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	3 * $Id: _elementtree.c 2657 2006-03-12 20:50:32Z 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 * 2001-06-05 fl backported to unix; fixed bogus free in clear
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	11 * 2001-07-10 fl added findall helper
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	12 * 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	13 * 2004-06-03 fl updates for elementtree 1.2
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	14 * 2005-01-05 fl added universal name cache, Element/SubElement factories
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	15 * 2005-01-06 fl moved python helpers into C module; removed 1.5.2 support
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	16 * 2005-01-07 fl added 2.1 support; work around broken __copy__ in 2.3
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	17 * 2005-01-08 fl added makeelement method; fixed path support
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	18 * 2005-01-10 fl optimized memory usage
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	19 * 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	20 * 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	21 * 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	22 * 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	23 * 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	24 * 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	25 * 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	26 * 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	27 * 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	28 * 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	29 * 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	30 * 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	31 * 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	32 * 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	33 * 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	34 * 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	35 * 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	36 * 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	37 * 2006-03-12 fl merge in 2.5 ssize_t changes
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	38 *
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	39 * Copyright (c) 1999-2006 by Secret Labs AB. All rights reserved.
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	40 * Copyright (c) 1999-2006 by Fredrik Lundh.
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	41 *
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	42 * info@pythonware.com
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	43 * http://www.pythonware.com
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	44 */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	45
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	46 /* Licensed to PSF under a Contributor Agreement. */
9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	47 /* See http://www.python.org/2.4/license for licensing details. */
9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	48
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	49 #include "Python.h"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	50
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	51 #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	52
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	53 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	54 /* configuration */
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 /* 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	57 #define USE_EXPAT
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	58
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	59 /* Define to to all expat calls via pyexpat's embedded expat library */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	60 /* #define USE_PYEXPAT_CAPI */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	61
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	62 /* 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	63 allocations. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	64 #define STATIC_CHILDREN 4
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	65
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	66 /* 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	67 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	68 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	69 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	70
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	71 /* Also note that pymalloc always allocates blocks in multiples of
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	72 eight bytes. For the current version of cElementTree, this means
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	73 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	74 32-bit platforms. */
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	78 #if 0
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	79 static int memory = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	80 #define ALLOC(size, comment)\
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	81 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	82 #define RELEASE(size, comment)\
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	83 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	84 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	85 #define ALLOC(size, comment)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	86 #define RELEASE(size, comment)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	87 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	88
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	89 /* compiler tweaks */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	90 #if defined(_MSC_VER)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	91 #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	92 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	93 #define LOCAL(type) static type
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	94 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	95
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	96 /* 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	97 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	98 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	99 info. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	100 #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	101 #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	102 #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	103
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	104 /* glue functions (see the init function for details) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	105 static PyObject* elementtree_copyelement_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	106 static PyObject* elementtree_deepcopy_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	107 static PyObject* elementtree_getiterator_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	108 static PyObject* elementpath_obj;
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 /* helpers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	111
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	112 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	113 deepcopy(PyObject* object, PyObject* memo)
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 /* 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	116
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	117 PyObject* args;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	118 PyObject* result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	119
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	120 if (!elementtree_deepcopy_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	121 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	122 PyExc_RuntimeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	123 "deepcopy helper not found"
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 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	126 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	127
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	128 args = PyTuple_New(2);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	129 if (!args)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	130 return NULL;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	131
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	132 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	133 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	134
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	135 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	136
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	137 Py_DECREF(args);
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 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	140 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	141
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	142 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	143 list_join(PyObject* list)
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 /* 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	146
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	147 PyObject* joiner;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	148 PyObject* function;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	149 PyObject* args;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	150 PyObject* result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	151
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	152 switch (PyList_GET_SIZE(list)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	153 case 0:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	154 Py_DECREF(list);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	155 return PyString_FromString("");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	156 case 1:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	157 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	158 Py_INCREF(result);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	159 Py_DECREF(list);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	160 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	161 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	162
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	163 /* 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	164 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	165
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	166 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	167 if (!joiner)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	168 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	169
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	170 function = PyObject_GetAttrString(joiner, "join");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	171 if (!function) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	172 Py_DECREF(joiner);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	173 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	174 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	175
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	176 args = PyTuple_New(1);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	177 if (!args)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	178 return NULL;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	179
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	180 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	181
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	182 result = PyObject_CallObject(function, args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	183
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	184 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	185 Py_DECREF(function);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	186 Py_DECREF(joiner);
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 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	189 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	190
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	191 #if (PY_VERSION_HEX < 0x02020000)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	192 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	193 PyDict_Update(PyObject* dict, PyObject* other)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	194 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	195 /* PyDict_Update emulation for 2.1 and earlier */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	196
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	197 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	198
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	199 res = PyObject_CallMethod(dict, "update", "O", other);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	200 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	201 return -1;
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 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	204 return 0;
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 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	207
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	208 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	209 /* the element type */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	210
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	211 typedef struct {
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 /* 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	214 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	215
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	216 /* child elements */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	217 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	218 int allocated; /* allocated items */
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 /* 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	221 PyObject* *children;
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 PyObject* _children[STATIC_CHILDREN];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	224
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	225 } ElementObjectExtra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	226
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	227 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	228 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	229
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	230 /* element tag (a string). */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	231 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	232
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	233 /* 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	234 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	235 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	236 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	237 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	238 should be left intact. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	239 PyObject* text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	240
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	241 /* 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	242 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	243 PyObject* tail;
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 ElementObjectExtra* extra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	246
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	247 } ElementObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	248
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	249 static PyTypeObject Element_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	250
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	251 #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	252
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	253 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	254 /* element constructor and destructor */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	255
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	256 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	257 element_new_extra(ElementObject* self, PyObject* attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	258 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	259 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	260 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	261 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	262
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	263 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	264 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	265
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	266 Py_INCREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	267 self->extra->attrib = attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	268
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	269 self->extra->length = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	270 self->extra->allocated = STATIC_CHILDREN;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	271 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	272
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	273 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	274 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	275
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	276 LOCAL(void)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	277 element_dealloc_extra(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	278 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	279 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	280
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	281 Py_DECREF(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	282
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	283 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	284 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	285
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	286 if (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	287 PyObject_Free(self->extra->children);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	288
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	289 PyObject_Free(self->extra);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	290 }
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 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	293 element_new(PyObject* tag, PyObject* attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	294 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	295 ElementObject* self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	296
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	297 self = PyObject_New(ElementObject, &Element_Type);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	298 if (self == NULL)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	299 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	300
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	301 /* use None for empty dictionaries */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	302 if (PyDict_CheckExact(attrib) && !PyDict_Size(attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	303 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	304
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	305 self->extra = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	306
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	307 if (attrib != Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	308
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37144 diff changeset	309 if (element_new_extra(self, attrib) < 0) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37144 diff changeset	310 PyObject_Del(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	311 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37144 diff changeset	312 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	313
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	314 self->extra->length = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	315 self->extra->allocated = STATIC_CHILDREN;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	316 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	317
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	320 Py_INCREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	321 self->tag = tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	322
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	323 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	324 self->text = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	325
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	326 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	327 self->tail = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	328
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	329 ALLOC(sizeof(ElementObject), "create element");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	330
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	331 return (PyObject*) self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	332 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	333
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	334 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	335 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	336 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	337 int size;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	338 PyObject* *children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	339
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	340 /* 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	341 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	342
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	343 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	344 element_new_extra(self, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	345
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	346 size = self->extra->length + extra;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	347
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	348 if (size > self->extra->allocated) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	349 /* 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	350 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	351 /* Coverity CID #182 size_error: Allocating 1 bytes to pointer "children"
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	352 * which needs at least 4 bytes.
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	353 * Although it's a false alarm always assume at least one child to
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	354 * be safe.
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	355 */
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	356 size = size ? size : 1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	357 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	358 /* Coverity CID #182 size_error: Allocating 1 bytes to pointer
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	359 * "children", which needs at least 4 bytes. Although it's a
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	360 * 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	361 */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	362 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	363 size * sizeof(PyObject*));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	364 if (!children)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	365 goto nomemory;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	366 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	367 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	368 if (!children)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	369 goto nomemory;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	370 /* 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	371 memcpy(children, self->extra->children,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	372 self->extra->length * sizeof(PyObject*));
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	373 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	374 self->extra->children = children;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	375 self->extra->allocated = size;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	376 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	377
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	378 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	379
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	380 nomemory:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	381 PyErr_NoMemory();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	382 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	383 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	384
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	385 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	386 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	387 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	388 /* 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	389
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	390 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	391 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	392
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	393 Py_INCREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	394 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	395
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	396 self->extra->length++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	397
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	398 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	399 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	400
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	401 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	402 element_get_attrib(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	403 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	404 /* 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	405 /* 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	406
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	407 PyObject* res = self->extra->attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	408
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	409 if (res == Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	410 /* create missing dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	411 res = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	412 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	413 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	414 self->extra->attrib = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	415 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	416
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	417 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	418 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	419
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	420 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	421 element_get_text(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	422 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	423 /* 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	424
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	425 PyObject* res = self->text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	426
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	427 if (JOIN_GET(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	428 res = JOIN_OBJ(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	429 if (PyList_CheckExact(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	430 res = list_join(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	431 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	432 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	433 self->text = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	434 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	435 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	436
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	437 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	438 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	439
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	440 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	441 element_get_tail(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	442 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	443 /* 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	444
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	445 PyObject* res = self->tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	446
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	447 if (JOIN_GET(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	448 res = JOIN_OBJ(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	449 if (PyList_CheckExact(res)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	450 res = list_join(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	451 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	452 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	453 self->tail = res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	454 }
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	457 return res;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	460 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	461 element(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	462 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	463 PyObject* elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	464
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	465 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	466 PyObject* attrib = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	467 if (!PyArg_ParseTuple(args, "O\|O!:Element", &tag,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	468 &PyDict_Type, &attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	469 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	470
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	471 if (attrib \|\| kw) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	472 attrib = (attrib) ? PyDict_Copy(attrib) : PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	473 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	474 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	475 if (kw)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	476 PyDict_Update(attrib, kw);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	477 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	478 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	479 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	480 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	481
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	482 elem = element_new(tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	483
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	484 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	485
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	486 return elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	487 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	488
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	489 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	490 subelement(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	491 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	492 PyObject* elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	493
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	494 ElementObject* parent;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	495 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	496 PyObject* attrib = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	497 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	498 &Element_Type, &parent, &tag,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	499 &PyDict_Type, &attrib))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	500 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	501
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	502 if (attrib \|\| kw) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	503 attrib = (attrib) ? PyDict_Copy(attrib) : PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	504 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	505 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	506 if (kw)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	507 PyDict_Update(attrib, kw);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	508 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	509 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	510 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	511 }
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 elem = element_new(tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	514
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	515 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	516
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	517 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	518 Py_DECREF(elem);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	519 return NULL;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	520 }
36050 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 return elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	523 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	524
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	525 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	526 element_dealloc(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	527 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	528 if (self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	529 element_dealloc_extra(self);
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 /* discard attributes */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	532 Py_DECREF(self->tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	533 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	534 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	535
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	536 RELEASE(sizeof(ElementObject), "destroy element");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	537
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	538 PyObject_Del(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	539 }
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 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	542 /* methods (in alphabetical order) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	543
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	544 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	545 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	546 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	547 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	548 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	549 return NULL;
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 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	552 return NULL;
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 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	555 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	558 element_clear(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	559 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	560 if (!PyArg_ParseTuple(args, ":clear"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	561 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	562
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	563 if (self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	564 element_dealloc_extra(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	565 self->extra = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	566 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	567
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	568 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	569 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	570 self->text = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	571
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	572 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	573 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	574 self->tail = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	575
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	576 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	577 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	580 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	581 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	582 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	583 ElementObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	584
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	585 if (!PyArg_ParseTuple(args, ":__copy__"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	586 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	587
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	588 element = (ElementObject*) element_new(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	589 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	590 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	591 if (!element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	592 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	593
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	594 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	595 element->text = self->text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	596 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	597
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	598 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	599 element->tail = self->tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	600 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	601
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	602 if (self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	603
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	604 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	605 Py_DECREF(element);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	606 return NULL;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	607 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	608
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	609 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	610 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	611 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	612 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	613
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	614 element->extra->length = self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	615
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	618 return (PyObject*) element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	619 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	620
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	621 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	622 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	623 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	624 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	625 ElementObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	626 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	627 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	628 PyObject* text;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	629 PyObject* tail;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	630 PyObject* id;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	631
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	632 PyObject* memo;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	633 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	634 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	635
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	636 tag = deepcopy(self->tag, memo);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	637 if (!tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	638 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	639
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	640 if (self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	641 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	642 if (!attrib) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	643 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	644 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	645 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	646 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	647 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	648 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	649 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	650
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	651 element = (ElementObject*) element_new(tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	652
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	653 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	654 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	655
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	656 if (!element)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	657 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	658
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	659 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	660 if (!text)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	661 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	662 Py_DECREF(element->text);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	663 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	664
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	665 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	666 if (!tail)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	667 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	668 Py_DECREF(element->tail);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	669 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	670
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	671 if (self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	672
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	673 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	674 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	675
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	676 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	677 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	678 if (!child) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	679 element->extra->length = i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	680 goto error;
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 element->extra->children[i] = child;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	685 element->extra->length = self->extra->length;
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 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	688
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	689 /* 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	690 id = PyLong_FromLong((Py_uintptr_t) self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	691
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	692 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	693
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	694 Py_DECREF(id);
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 if (i < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	697 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	698
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	699 return (PyObject*) element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	700
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	701 error:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	702 Py_DECREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	703 return NULL;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	706 LOCAL(int)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	707 checkpath(PyObject* tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	708 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	709 Py_ssize_t i;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	710 int check = 1;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	711
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	712 /* 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	713
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	714 #define PATHCHAR(ch) (ch == '/' \|\| ch == '*' \|\| ch == '[' \|\| ch == '@')
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 if (PyUnicode_Check(tag)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	717 Py_UNICODE *p = PyUnicode_AS_UNICODE(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	718 for (i = 0; i < PyUnicode_GET_SIZE(tag); i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	719 if (p[i] == '{')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	720 check = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	721 else if (p[i] == '}')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	722 check = 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	723 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	724 return 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	725 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	726 return 0;
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 (PyString_Check(tag)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	729 char *p = PyString_AS_STRING(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	730 for (i = 0; i < PyString_GET_SIZE(tag); i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	731 if (p[i] == '{')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	732 check = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	733 else if (p[i] == '}')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	734 check = 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	735 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	736 return 1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	737 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	738 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	739 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	740
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	741 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	742 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	743
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	744 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	745 element_find(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	746 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	747 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	748
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	749 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	750 if (!PyArg_ParseTuple(args, "O:find", &tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	751 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	752
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	753 if (checkpath(tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	754 return PyObject_CallMethod(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	755 elementpath_obj, "find", "OO", self, tag
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 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	759 Py_RETURN_NONE;
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 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	762 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	763 if (Element_CheckExact(item) &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	764 PyObject_Compare(((ElementObject*)item)->tag, tag) == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	765 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	766 return item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	767 }
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	770 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	771 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	774 element_findtext(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	775 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	776 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	777
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	778 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	779 PyObject* default_value = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	780 if (!PyArg_ParseTuple(args, "O\|O:findtext", &tag, &default_value))
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 if (checkpath(tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	784 return PyObject_CallMethod(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	785 elementpath_obj, "findtext", "OOO", self, tag, default_value
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	788 if (!self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	789 Py_INCREF(default_value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	790 return default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	791 }
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 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	794 ElementObject* item = (ElementObject*) self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	795 if (Element_CheckExact(item) && !PyObject_Compare(item->tag, tag)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	796 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	797 if (text == Py_None)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	798 return PyString_FromString("");
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	799 Py_XINCREF(text);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	800 return 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 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	803
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	804 Py_INCREF(default_value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	805 return default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	806 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	809 element_findall(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	810 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	811 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	812 PyObject* out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	813
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	814 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	815 if (!PyArg_ParseTuple(args, "O:findall", &tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	816 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	817
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	818 if (checkpath(tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	819 return PyObject_CallMethod(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	820 elementpath_obj, "findall", "OO", self, tag
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	823 out = PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	824 if (!out)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	825 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	826
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	827 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	828 return out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	829
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	830 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	831 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	832 if (Element_CheckExact(item) &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	833 PyObject_Compare(((ElementObject*)item)->tag, tag) == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	834 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	835 Py_DECREF(out);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	836 return NULL;
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 }
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	841 return out;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	842 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	845 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	846 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	847 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	848
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	849 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	850 PyObject* default_value = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	851 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	852 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	853
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	854 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	855 value = default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	856 else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	857 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	858 if (!value)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	859 value = default_value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	860 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	861
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	862 Py_INCREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	863 return value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	864 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	865
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	866 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	867 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	868 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	869 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	870 PyObject* list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	871
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	872 if (!PyArg_ParseTuple(args, ":getchildren"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	873 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	874
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	875 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	876 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	877
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	878 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	879 if (!list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	880 return NULL;
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 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	883 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	884 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	885 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	886 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	887
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	888 return list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	889 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	890
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	891 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	892 element_getiterator(ElementObject* self, PyObject* args)
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 PyObject* result;
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 PyObject* tag = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	897 if (!PyArg_ParseTuple(args, "\|O:getiterator", &tag))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	898 return NULL;
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 if (!elementtree_getiterator_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	901 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	902 PyExc_RuntimeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	903 "getiterator helper not found"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	904 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	905 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	906 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	907
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	908 args = PyTuple_New(2);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	909 if (!args)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	910 return NULL;
36450 c193283e63bc Check return results for errors Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	911
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	912 Py_INCREF(self); PyTuple_SET_ITEM(args, 0, (PyObject*) self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	913 Py_INCREF(tag); PyTuple_SET_ITEM(args, 1, (PyObject*) tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	914
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	915 result = PyObject_CallObject(elementtree_getiterator_obj, args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	916
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	917 Py_DECREF(args);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	918
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	919 return result;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	920 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	921
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	922 static PyObject*
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	923 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	924 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	925 ElementObject* self = (ElementObject*) self_;
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	926
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	927 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	928 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	929 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	930 "child index out of range"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	931 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	932 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	933 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	934
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	935 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	936 return self->extra->children[index];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	937 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	938
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	939 static PyObject*
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	940 element_getslice(PyObject* self_, Py_ssize_t start, Py_ssize_t end)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	941 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	942 ElementObject* self = (ElementObject*) self_;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	943 Py_ssize_t i;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	944 PyObject* list;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	945
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	946 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	947 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	948
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	949 /* standard clamping */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	950 if (start < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	951 start = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	952 if (end < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	953 end = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	954 if (end > self->extra->length)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	955 end = self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	956 if (start > end)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	957 start = end;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	958
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	959 list = PyList_New(end - start);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	960 if (!list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	961 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	962
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	963 for (i = start; i < end; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	964 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	965 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	966 PyList_SET_ITEM(list, i - start, item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	967 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	968
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	969 return list;
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	973 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	974 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	975 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	976
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	977 int index;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	978 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	979 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	980 &Element_Type, &element))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	981 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	982
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	983 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	984 element_new_extra(self, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	985
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	986 if (index < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	987 index = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	988 if (index > self->extra->length)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	989 index = self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	990
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	991 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	992 return NULL;
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 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	995 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	996
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	997 Py_INCREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	998 self->extra->children[index] = element;
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 self->extra->length++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1001
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1002 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1003 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1004
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1005 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1006 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	1007 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1008 if (!PyArg_ParseTuple(args, ":items"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1009 return NULL;
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 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	1012 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1013
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1014 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	1015 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1016
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1017 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1018 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	1019 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1020 if (!PyArg_ParseTuple(args, ":keys"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1021 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1022
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1023 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	1024 return PyList_New(0);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1025
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1026 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	1027 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1028
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1029 static Py_ssize_t
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1030 element_length(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1031 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1032 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1033 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1034
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1035 return self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1036 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1037
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1038 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1039 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	1040 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1041 PyObject* elem;
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 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1044 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1045 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	1046 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1047
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1048 attrib = PyDict_Copy(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1049 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1050 return NULL;
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 elem = element_new(tag, attrib);
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 Py_DECREF(attrib);
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 return elem;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1057 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1058
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1059 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1060 element_reduce(ElementObject* self, PyObject* args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1061 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1062 if (!PyArg_ParseTuple(args, ":__reduce__"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1063 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1064
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1065 /* Hack alert: This method is used to work around a __copy__
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1066 problem on certain 2.3 and 2.4 versions. To save time and
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1067 simplify the code, we create the copy in here, and use a dummy
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1068 copyelement helper to trick the copy module into doing the
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1069 right thing. */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1070
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1071 if (!elementtree_copyelement_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1072 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1073 PyExc_RuntimeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1074 "copyelement helper not found"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1075 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1076 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1077 }
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 return Py_BuildValue(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1080 "O(N)", elementtree_copyelement_obj, element_copy(self, args)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1081 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1082 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1085 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	1086 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1087 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1088
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1089 PyObject* element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1090 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	1091 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1092
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1093 if (!self->extra) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1094 /* 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	1095 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1096 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1097 "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	1098 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1099 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1100 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1101
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1102 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	1103 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	1104 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1105 if (PyObject_Compare(self->extra->children[i], element) == 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1106 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1107 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1108
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1109 if (i == self->extra->length) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1110 /* 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	1111 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1112 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1113 "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	1114 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1115 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1116 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1117
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1118 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	1119
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1120 self->extra->length--;
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 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	1123 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	1124
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1125 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1126 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1127
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1128 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1129 element_repr(ElementObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1130 {
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	1131 return PyUnicode_FromFormat("<Element %R at %p>", self->tag, self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1132 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1133
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1134 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1135 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	1136 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1137 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1138
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1139 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1140 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1141 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	1142 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1143
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1144 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1145 element_new_extra(self, NULL);
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 attrib = element_get_attrib(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1148 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1149 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1150
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1151 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	1152 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1153
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1154 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1155 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1156
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1157 static int
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1158 element_setslice(PyObject* self_, Py_ssize_t start, Py_ssize_t end, PyObject* item)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1159 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1160 ElementObject* self = (ElementObject*) self_;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1161 Py_ssize_t i, new, old;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1162 PyObject* recycle = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1163
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1164 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1165 element_new_extra(self, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1166
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1167 /* standard clamping */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1168 if (start < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1169 start = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1170 if (end < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1171 end = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1172 if (end > self->extra->length)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1173 end = self->extra->length;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1174 if (start > end)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1175 start = end;
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 old = end - start;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1178
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1179 if (item == NULL)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1180 new = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1181 else if (PyList_CheckExact(item)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1182 new = PyList_GET_SIZE(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1183 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1184 /* FIXME: support arbitrary sequences? */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1185 PyErr_Format(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1186 PyExc_TypeError,
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	1187 "expected list, not \"%.200s\"", Py_TYPE(item)->tp_name
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1188 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1189 return -1;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1192 if (old > 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1193 /* to avoid recursive calls to this method (via decref), move
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1194 old items to the recycle bin here, and get rid of them when
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1195 we're done modifying the element */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1196 recycle = PyList_New(old);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1197 for (i = 0; i < old; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1198 PyList_SET_ITEM(recycle, i, self->extra->children[i + start]);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1199 }
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 if (new < old) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1202 /* delete slice */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1203 for (i = end; i < self->extra->length; i++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1204 self->extra->children[i + new - old] = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1205 } else if (new > old) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1206 /* insert slice */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1207 if (element_resize(self, new - old) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1208 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1209 for (i = self->extra->length-1; i >= end; i--)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1210 self->extra->children[i + new - old] = self->extra->children[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1211 }
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 /* replace the slice */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1214 for (i = 0; i < new; i++) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1215 PyObject* element = PyList_GET_ITEM(item, i);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1216 Py_INCREF(element);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1217 self->extra->children[i + start] = element;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1218 }
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 self->extra->length += new - old;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1221
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1222 /* discard the recycle bin, and everything in it */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1223 Py_XDECREF(recycle);
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 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1226 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1227
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1228 static int
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1229 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	1230 {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1231 ElementObject* self = (ElementObject*) self_;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1232 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1233 PyObject* old;
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 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	1236 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1237 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1238 "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	1239 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1240 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1241
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1242 old = self->extra->children[index];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1243
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1244 if (item) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1245 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1246 self->extra->children[index] = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1247 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1248 self->extra->length--;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1249 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	1250 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	1251 }
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 Py_DECREF(old);
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 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1256 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1257
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1258 static PyMethodDef element_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1259
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1260 {"clear", (PyCFunction) element_clear, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1261
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1262 {"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	1263 {"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	1264
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1265 {"find", (PyCFunction) element_find, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1266 {"findtext", (PyCFunction) element_findtext, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1267 {"findall", (PyCFunction) element_findall, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1268
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1269 {"append", (PyCFunction) element_append, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1270 {"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	1271 {"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	1272
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1273 {"getiterator", (PyCFunction) element_getiterator, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1274 {"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	1275
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1276 {"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	1277 {"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	1278
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1279 {"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	1280
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1281 {"__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	1282 {"__deepcopy__", (PyCFunction) element_deepcopy, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1283
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1284 /* Some 2.3 and 2.4 versions do not handle the __copy__ method on
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1285 C objects correctly, so we have to fake it using a __reduce__-
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1286 based hack (see the element_reduce implementation above for
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1287 details). */
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 /* The behaviour has been changed in 2.3.5 and 2.4.1, so we're
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1290 using a runtime test to figure out if we need to fake things
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1291 or now (see the init code below). The following entry is
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1292 enabled only if the hack is needed. */
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 {"!__reduce__", (PyCFunction) element_reduce, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1295
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1296 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1297 };
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1300 element_getattr(ElementObject* self, char* name)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1301 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1302 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1303
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1304 res = Py_FindMethod(element_methods, (PyObject*) self, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1305 if (res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1306 return res;
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 PyErr_Clear();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1309
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1310 if (strcmp(name, "tag") == 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1311 res = self->tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1312 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	1313 res = element_get_text(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1314 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	1315 res = element_get_tail(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1316 } 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	1317 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1318 element_new_extra(self, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1319 res = element_get_attrib(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1320 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1321 PyErr_SetString(PyExc_AttributeError, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1322 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1323 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1324
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1325 if (!res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1326 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1327
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1328 Py_INCREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1329 return res;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1333 element_setattr(ElementObject* self, const char* name, PyObject* value)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1334 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1335 if (value == NULL) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1336 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1337 PyExc_AttributeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1338 "can't delete element attributes"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1339 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1340 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1341 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1342
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1343 if (strcmp(name, "tag") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1344 Py_DECREF(self->tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1345 self->tag = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1346 Py_INCREF(self->tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1347 } 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	1348 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	1349 self->text = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1350 Py_INCREF(self->text);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1351 } 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	1352 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	1353 self->tail = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1354 Py_INCREF(self->tail);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1355 } 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	1356 if (!self->extra)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1357 element_new_extra(self, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1358 Py_DECREF(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1359 self->extra->attrib = value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1360 Py_INCREF(self->extra->attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1361 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1362 PyErr_SetString(PyExc_AttributeError, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1363 return -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1364 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1365
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1366 return 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1367 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1368
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1369 static PySequenceMethods element_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1370 (lenfunc) element_length,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1371 0, /* sq_concat */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1372 0, /* sq_repeat */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1373 element_getitem,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1374 element_getslice,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1375 element_setitem,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36450 diff changeset	1376 element_setslice,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1377 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1378
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	1379 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	1380 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	1381 "Element", sizeof(ElementObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1382 /* methods */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1383 (destructor)element_dealloc, /* tp_dealloc */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1384 0, /* tp_print */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1385 (getattrfunc)element_getattr, /* tp_getattr */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1386 (setattrfunc)element_setattr, /* tp_setattr */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1387 0, /* tp_compare */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1388 (reprfunc)element_repr, /* tp_repr */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1389 0, /* tp_as_number */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1390 &element_as_sequence, /* tp_as_sequence */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1391 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1392
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1393 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1394 /* the tree builder type */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1395
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1396 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1397 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1398
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1399 PyObject* root; /* root node (first created node) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1400
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1401 ElementObject* this; /* current node */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1402 ElementObject* last; /* most recently created node */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1403
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1404 PyObject* data; /* data collector (string or list), or NULL */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1405
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1406 PyObject* stack; /* element stack */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1407 Py_ssize_t index; /* current stack size (0=empty) */
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1408
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1409 /* element tracing */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1410 PyObject* events; /* list of events, or NULL if not collecting */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1411 PyObject* start_event_obj; /* event objects (NULL to ignore) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1412 PyObject* end_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1413 PyObject* start_ns_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1414 PyObject* end_ns_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1415
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1416 } TreeBuilderObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1417
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	1418 static PyTypeObject TreeBuilder_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1419
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	1420 #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	1421
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1422 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1423 /* constructor and destructor */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1424
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1425 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1426 treebuilder_new(void)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1427 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1428 TreeBuilderObject* self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1429
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1430 self = PyObject_New(TreeBuilderObject, &TreeBuilder_Type);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1431 if (self == NULL)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1432 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1433
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1434 self->root = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1435
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1436 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1437 self->this = (ElementObject*) Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1438
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1439 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1440 self->last = (ElementObject*) Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1441
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1442 self->data = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1443
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1444 self->stack = PyList_New(20);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1445 self->index = 0;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1446
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1447 self->events = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1448 self->start_event_obj = self->end_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1449 self->start_ns_event_obj = self->end_ns_event_obj = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1450
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1451 ALLOC(sizeof(TreeBuilderObject), "create treebuilder");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1452
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1453 return (PyObject*) self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1454 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1455
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1456 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1457 treebuilder(PyObject* self_, PyObject* args)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1458 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1459 if (!PyArg_ParseTuple(args, ":TreeBuilder"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1460 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1461
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1462 return treebuilder_new();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1463 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1464
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1465 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1466 treebuilder_dealloc(TreeBuilderObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1467 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1468 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	1469 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	1470 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	1471 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	1472 Py_XDECREF(self->events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1473 Py_DECREF(self->stack);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1474 Py_XDECREF(self->data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1475 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1476 Py_DECREF(self->this);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1477 Py_XDECREF(self->root);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1478
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1479 RELEASE(sizeof(TreeBuilderObject), "destroy treebuilder");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1480
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1481 PyObject_Del(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1482 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1483
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1484 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1485 /* handlers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1486
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1487 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1488 treebuilder_handle_xml(TreeBuilderObject* self, PyObject* encoding,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1489 PyObject* standalone)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1490 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1491 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1492 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1493
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1494 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1495 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	1496 PyObject* attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1497 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1498 PyObject* node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1499 PyObject* this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1500
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1501 if (self->data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1502 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	1503 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	1504 self->last->text = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1505 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	1506 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1507 } else {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1508 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	1509 self->last->tail = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1510 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	1511 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1512 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1513 self->data = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1514 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1515
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1516 node = element_new(tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1517 if (!node)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1518 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1519
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1520 this = (PyObject*) self->this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1521
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1522 if (this != Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1523 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	1524 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1525 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1526 if (self->root) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1527 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1528 PyExc_SyntaxError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1529 "multiple elements on top level"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1530 );
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1531 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1532 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1533 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1534 self->root = node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1535 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1536
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1537 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	1538 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	1539 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1540 Py_INCREF(this);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1541 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1542 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	1543 goto error;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1544 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1545 self->index++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1546
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1547 Py_DECREF(this);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1548 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1549 self->this = (ElementObject*) node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1550
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1551 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1552 Py_INCREF(node);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1553 self->last = (ElementObject*) node;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1554
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1555 if (self->start_event_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1556 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1557 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	1558 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1559 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1560 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	1561 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	1562 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1563 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1564 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1565 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1566 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1567
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1568 return node;
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1569
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1570 error:
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1571 Py_DECREF(node);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1572 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1573 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1574
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1575 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1576 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	1577 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1578 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	1579 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	1580 /* 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	1581 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	1582 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1583 /* 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	1584 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	1585 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1586 /* more than one item; use a list to collect items */
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	1587 if (PyString_CheckExact(self->data) && Py_REFCNT(self->data) == 1 &&
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1588 PyString_CheckExact(data) && PyString_GET_SIZE(data) == 1) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1589 /* 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	1590 the most common case by resizing the existing string... */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1591 Py_ssize_t size = PyString_GET_SIZE(self->data);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1592 if (_PyString_Resize(&self->data, size + 1) < 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1593 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1594 PyString_AS_STRING(self->data)[size] = PyString_AS_STRING(data)[0];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1595 } 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	1596 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	1597 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1598 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1599 PyObject* list = PyList_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1600 if (!list)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1601 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1602 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	1603 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	1604 self->data = list;
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 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1607
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1608 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1609 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1610
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1611 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1612 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	1613 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1614 PyObject* item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1615
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1616 if (self->data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1617 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	1618 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	1619 self->last->text = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1620 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	1621 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1622 } else {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	1623 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	1624 self->last->tail = JOIN_SET(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1625 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	1626 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1627 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1628 self->data = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1629 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1630
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1631 if (self->index == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1632 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1633 PyExc_IndexError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1634 "pop from empty stack"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1635 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1636 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1637 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1638
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1639 self->index--;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1640
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1641 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	1642 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1643
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1644 Py_DECREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1645
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1646 self->last = (ElementObject*) self->this;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1647 self->this = (ElementObject*) item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1648
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1649 if (self->end_event_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1650 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1651 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	1652 PyObject* node = (PyObject*) self->last;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1653 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1654 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1655 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	1656 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	1657 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1658 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1659 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1660 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1661 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1662
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1663 Py_INCREF(self->last);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1664 return (PyObject*) self->last;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1665 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1666
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1667 LOCAL(void)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1668 treebuilder_handle_namespace(TreeBuilderObject* self, int start,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1669 const char* prefix, const char *uri)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1670 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1671 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1672 PyObject* action;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1673 PyObject* parcel;
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 if (!self->events)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1676 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1677
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1678 if (start) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1679 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	1680 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1681 action = self->start_ns_event_obj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1682 /* FIXME: prefix and uri use utf-8 encoding! */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1683 parcel = Py_BuildValue("ss", (prefix) ? prefix : "", uri);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1684 if (!parcel)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1685 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1686 Py_INCREF(action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1687 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1688 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	1689 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1690 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	1691 Py_INCREF(action);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1692 parcel = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1693 Py_INCREF(parcel);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1694 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1695
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1696 res = PyTuple_New(2);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1697
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1698 if (res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1699 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	1700 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	1701 PyList_Append(self->events, res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1702 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1703 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1704 PyErr_Clear(); /* FIXME: propagate error */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1705 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1706
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 /* methods (in alphabetical order) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1709
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1710 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1711 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	1712 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1713 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1714 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	1715 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1716
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1717 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	1718 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1719
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1720 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1721 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	1722 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1723 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1724 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	1725 return NULL;
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 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	1728 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1729
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1730 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1731 treebuilder_done(TreeBuilderObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1732 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1733 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1734
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1735 /* FIXME: check stack size? */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1736
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1737 if (self->root)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1738 res = self->root;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1739 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1740 res = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1741
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1742 Py_INCREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1743 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1744 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1745
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1746 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1747 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	1748 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1749 if (!PyArg_ParseTuple(args, ":close"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1750 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1751
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1752 return treebuilder_done(self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1753 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1754
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1755 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1756 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	1757 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1758 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1759 PyObject* attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1760 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	1761 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1762
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1763 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	1764 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1765
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1766 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1767 treebuilder_xml(TreeBuilderObject* self, PyObject* args)
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 PyObject* encoding;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1770 PyObject* standalone;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1771 if (!PyArg_ParseTuple(args, "OO:xml", &encoding, &standalone))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1772 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1773
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1774 return treebuilder_handle_xml(self, encoding, standalone);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1775 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1776
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1777 static PyMethodDef treebuilder_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1778 {"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	1779 {"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	1780 {"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	1781 {"xml", (PyCFunction) treebuilder_xml, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1782 {"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	1783 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1784 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1785
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1786 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1787 treebuilder_getattr(TreeBuilderObject* self, char* name)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1788 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1789 return Py_FindMethod(treebuilder_methods, (PyObject*) self, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1790 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1791
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	1792 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	1793 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	1794 "TreeBuilder", sizeof(TreeBuilderObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1795 /* methods */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1796 (destructor)treebuilder_dealloc, /* tp_dealloc */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1797 0, /* tp_print */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1798 (getattrfunc)treebuilder_getattr, /* tp_getattr */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1799 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1800
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1801 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1802 /* the expat interface */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1803
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1804 #if defined(USE_EXPAT)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1805
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1806 #include "expat.h"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1807
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1808 #if defined(USE_PYEXPAT_CAPI)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1809 #include "pyexpat.h"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1810 static struct PyExpat_CAPI* expat_capi;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1811 #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	1812 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1813 #define EXPAT(func) (XML_##func)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1814 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1815
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1816 typedef struct {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1817 PyObject_HEAD
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1818
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1819 XML_Parser parser;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1820
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1821 PyObject* target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1822 PyObject* entity;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1823
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1824 PyObject* names;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1825
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1826 PyObject* handle_xml;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1827 PyObject* handle_start;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1828 PyObject* handle_data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1829 PyObject* handle_end;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1830
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1831 PyObject* handle_comment;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1832 PyObject* handle_pi;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1833
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1834 } XMLParserObject;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1835
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	1836 static PyTypeObject XMLParser_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1837
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1838 /* helpers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1839
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1840 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1841 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	1842 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1843 /* 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	1844 to a universal name string */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1845
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1846 int size = strlen(string);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1847 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1848 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1849
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1850 /* look the 'raw' name up in the names dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1851 key = PyString_FromStringAndSize(string, size);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1852 if (!key)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1853 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1854
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1855 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	1856
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1857 if (value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1858 Py_INCREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1859 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1860 /* 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	1861 necessary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1862
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1863 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1864 char* p;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1865 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1866
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1867 /* look for namespace separator */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1868 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	1869 if (string[i] == '}')
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1870 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1871 if (i != size) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1872 /* convert to universal name */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1873 tag = PyString_FromStringAndSize(NULL, size+1);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1874 p = PyString_AS_STRING(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1875 p[0] = '{';
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1876 memcpy(p+1, string, size);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1877 size++;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1878 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1879 /* 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	1880 Py_INCREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1881 tag = key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1882 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1883
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1884 /* decode universal name */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1885 p = PyString_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	1886 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	1887 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	1888 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	1889 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	1890 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	1891 }
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1892
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1893 /* add to names dictionary */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1894 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	1895 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1896 Py_DECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1897 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1898 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1899 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1900
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1901 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1902 return value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1903 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1904
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1905 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1906 /* handlers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1907
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1908 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1909 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	1910 int data_len)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1911 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1912 PyObject* key;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1913 PyObject* value;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1914 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1915
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1916 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	1917 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1918
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	1919 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	1920 if (!key)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1921 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1922
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1923 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	1924
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1925 if (value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1926 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1927 res = treebuilder_handle_data(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1928 (TreeBuilderObject*) self->target, value
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1929 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1930 else if (self->handle_data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1931 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	1932 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1933 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1934 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1935 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1936 PyErr_Format(
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1937 PyExc_SyntaxError, "undefined entity &%s;: line %ld, column %ld",
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1938 PyString_AS_STRING(key),
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1939 EXPAT(GetErrorLineNumber)(self->parser),
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1940 EXPAT(GetErrorColumnNumber)(self->parser)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1941 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1942 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1943
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1944 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1945 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1946
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1947 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1948 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	1949 const XML_Char **attrib_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1950 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1951 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1952 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1953 PyObject* attrib;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1954 int ok;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1955
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1956 /* tag name */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1957 tag = makeuniversal(self, tag_in);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1958 if (!tag)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1959 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	1960
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1961 /* attributes */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1962 if (attrib_in[0]) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1963 attrib = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1964 if (!attrib)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1965 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1966 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	1967 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	1968 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	1969 if (!key \|\| !value) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1970 Py_XDECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1971 Py_XDECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1972 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1973 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1974 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1975 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	1976 Py_DECREF(value);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1977 Py_DECREF(key);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1978 if (ok < 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1979 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1980 return;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1981 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1982 attrib_in += 2;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1983 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1984 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1985 Py_INCREF(Py_None);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1986 attrib = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1987 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1988
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1989 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1990 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1991 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	1992 tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1993 else if (self->handle_start)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1994 res = PyObject_CallFunction(self->handle_start, "OO", tag, attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1995 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1996 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1997
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1998 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	1999 Py_DECREF(attrib);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2000
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2001 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2002 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2003
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2004 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2005 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	2006 int data_len)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2007 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2008 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2009 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2010
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	2011 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	2012 if (!data)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2013 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	2014
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2015 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2016 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2017 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	2018 else if (self->handle_data)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2019 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	2020 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2021 res = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2022
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2023 Py_DECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2024
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2025 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2026 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2027
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2028 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2029 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	2030 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2031 PyObject* tag;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2032 PyObject* res = NULL;
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 if (TreeBuilder_CheckExact(self->target))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2035 /* shortcut */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2036 /* 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	2037 res = treebuilder_handle_end(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2038 (TreeBuilderObject*) self->target, Py_None
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2039 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2040 else if (self->handle_end) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2041 tag = makeuniversal(self, tag_in);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2042 if (tag) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2043 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	2044 Py_DECREF(tag);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2045 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2046 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2047
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2048 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2049 }
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 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2052 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	2053 const XML_Char *uri)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2054 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2055 treebuilder_handle_namespace(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2056 (TreeBuilderObject*) self->target, 1, prefix, uri
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2057 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2058 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2059
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2060 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2061 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	2062 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2063 treebuilder_handle_namespace(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2064 (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	2065 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2066 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2067
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2068 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2069 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	2070 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2071 PyObject* comment;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2072 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2073
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2074 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	2075 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	2076 if (comment) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2077 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	2078 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2079 Py_DECREF(comment);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2080 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2081 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2082 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2083
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2084 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2085 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	2086 const XML_Char* data_in)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2087 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2088 PyObject* target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2089 PyObject* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2090 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2091
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2092 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	2093 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	2094 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	2095 if (target && data) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2096 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	2097 Py_XDECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2098 Py_DECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2099 Py_DECREF(target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2100 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2101 Py_XDECREF(data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2102 Py_XDECREF(target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2103 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2104 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2105 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2106
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2107 static int
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2108 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	2109 XML_Encoding *info)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2110 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2111 PyObject* u;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2112 Py_UNICODE* p;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2113 unsigned char s[256];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2114 int i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2115
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2116 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	2117
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2118 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	2119 s[i] = i;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2120
36117 7d6ab9f39996 SF#1389809 Fredrik Lundh <fredrik@pythonware.com> parents: 36083 diff changeset	2121 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	2122 if (!u)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2123 return XML_STATUS_ERROR;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2124
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2125 if (PyUnicode_GET_SIZE(u) != 256) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2126 Py_DECREF(u);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2127 return XML_STATUS_ERROR;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2128 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2129
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2130 p = PyUnicode_AS_UNICODE(u);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2131
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2132 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	2133 if (p[i] != Py_UNICODE_REPLACEMENT_CHARACTER)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2134 info->map[i] = p[i];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2135 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2136 info->map[i] = -1;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2137 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2138
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2139 Py_DECREF(u);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2140
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2141 return XML_STATUS_OK;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2142 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2143
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2144 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2145 /* constructor and destructor */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2146
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2147 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2148 xmlparser(PyObject* self_, PyObject* args, PyObject* kw)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2149 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2150 XMLParserObject* self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2151 /* FIXME: does this need to be static? */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2152 static XML_Memory_Handling_Suite memory_handler;
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 PyObject* target = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2155 char* encoding = NULL;
36684 0bebeb393045 More unconsting. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	2156 static char* kwlist[] = { "target", "encoding", NULL };
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2157 if (!PyArg_ParseTupleAndKeywords(args, kw, "\|Oz:XMLParser", kwlist,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2158 &target, &encoding))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2159 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2160
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2161 #if defined(USE_PYEXPAT_CAPI)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2162 if (!expat_capi) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2163 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2164 PyExc_RuntimeError, "cannot load dispatch table from pyexpat"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2165 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2166 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2167 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2168 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2169
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2170 self = PyObject_New(XMLParserObject, &XMLParser_Type);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2171 if (self == NULL)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2172 return NULL;
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 self->entity = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2175 if (!self->entity) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2176 PyObject_Del(self);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2177 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2178 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2179
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2180 self->names = PyDict_New();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2181 if (!self->names) {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2182 PyObject_Del(self->entity);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2183 PyObject_Del(self);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2184 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2185 }
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 memory_handler.malloc_fcn = PyObject_Malloc;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2188 memory_handler.realloc_fcn = PyObject_Realloc;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2189 memory_handler.free_fcn = PyObject_Free;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2190
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2191 self->parser = EXPAT(ParserCreate_MM)(encoding, &memory_handler, "}");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2192 if (!self->parser) {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2193 PyObject_Del(self->names);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2194 PyObject_Del(self->entity);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2195 PyObject_Del(self);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2196 PyErr_NoMemory();
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2197 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2198 }
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 /* setup target handlers */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2201 if (!target) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2202 target = treebuilder_new();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2203 if (!target) {
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2204 EXPAT(ParserFree)(self->parser);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2205 PyObject_Del(self->names);
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2206 PyObject_Del(self->entity);
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2207 PyObject_Del(self);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2208 return NULL;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2209 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2210 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2211 Py_INCREF(target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2212 self->target = target;
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 self->handle_xml = PyObject_GetAttrString(target, "xml");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2215 self->handle_start = PyObject_GetAttrString(target, "start");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2216 self->handle_data = PyObject_GetAttrString(target, "data");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2217 self->handle_end = PyObject_GetAttrString(target, "end");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2218 self->handle_comment = PyObject_GetAttrString(target, "comment");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2219 self->handle_pi = PyObject_GetAttrString(target, "pi");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2220
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2221 PyErr_Clear();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2222
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2223 /* configure parser */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2224 EXPAT(SetUserData)(self->parser, self);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2225 EXPAT(SetElementHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2226 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2227 (XML_StartElementHandler) expat_start_handler,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2228 (XML_EndElementHandler) expat_end_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2229 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2230 EXPAT(SetDefaultHandlerExpand)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2231 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2232 (XML_DefaultHandler) expat_default_handler
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 EXPAT(SetCharacterDataHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2235 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2236 (XML_CharacterDataHandler) expat_data_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2237 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2238 if (self->handle_comment)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2239 EXPAT(SetCommentHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2240 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2241 (XML_CommentHandler) expat_comment_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2242 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2243 if (self->handle_pi)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2244 EXPAT(SetProcessingInstructionHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2245 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2246 (XML_ProcessingInstructionHandler) expat_pi_handler
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2247 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2248 EXPAT(SetUnknownEncodingHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2249 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2250 (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	2251 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2252
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2253 ALLOC(sizeof(XMLParserObject), "create expatparser");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2254
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2255 return (PyObject*) self;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2256 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2257
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2258 static void
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2259 xmlparser_dealloc(XMLParserObject* self)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2260 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2261 EXPAT(ParserFree)(self->parser);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2262
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2263 Py_XDECREF(self->handle_pi);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2264 Py_XDECREF(self->handle_comment);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2265 Py_XDECREF(self->handle_end);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2266 Py_XDECREF(self->handle_data);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2267 Py_XDECREF(self->handle_start);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2268 Py_XDECREF(self->handle_xml);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2269
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2270 Py_DECREF(self->target);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2271 Py_DECREF(self->entity);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2272 Py_DECREF(self->names);
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 RELEASE(sizeof(XMLParserObject), "destroy expatparser");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2275
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2276 PyObject_Del(self);
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2279 /* -------------------------------------------------------------------- */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2280 /* methods (in alphabetical order) */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2281
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2282 LOCAL(PyObject*)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2283 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	2284 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2285 int ok;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2286
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2287 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	2288
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2289 if (PyErr_Occurred())
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2290 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2291
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2292 if (!ok) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2293 PyErr_Format(
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2294 PyExc_SyntaxError, "%s: line %ld, column %ld",
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2295 EXPAT(ErrorString)(EXPAT(GetErrorCode)(self->parser)),
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2296 EXPAT(GetErrorLineNumber)(self->parser),
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2297 EXPAT(GetErrorColumnNumber)(self->parser)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2298 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2299 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2300 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2301
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2302 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2303 }
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2306 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	2307 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2308 /* end feeding data to parser */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2309
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2310 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2311 if (!PyArg_ParseTuple(args, ":close"))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2312 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2313
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2314 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	2315
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2316 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	2317 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2318 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	2319 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2320
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2321 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2322 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2323
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2324 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2325 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	2326 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2327 /* feed data to parser */
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 char* data;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2330 int data_len;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2331 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	2332 return NULL;
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 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	2335 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2336
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2337 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2338 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	2339 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2340 /* (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	2341
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2342 PyObject* reader;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2343 PyObject* buffer;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2344 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2345
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2346 PyObject* fileobj;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2347 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	2348 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2349
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2350 reader = PyObject_GetAttrString(fileobj, "read");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2351 if (!reader)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2352 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2353
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2354 /* read from open file object */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2355 for (;;) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2356
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2357 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	2358
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2359 if (!buffer) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2360 /* 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	2361 Py_DECREF(reader);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2362 return NULL;
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2365 if (!PyString_CheckExact(buffer) \|\| PyString_GET_SIZE(buffer) == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2366 Py_DECREF(buffer);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2367 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2368 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2369
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2370 res = expat_parse(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2371 self, PyString_AS_STRING(buffer), PyString_GET_SIZE(buffer), 0
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 Py_DECREF(buffer);
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 if (!res) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2377 Py_DECREF(reader);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2378 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2379 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2380 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2381
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2384 Py_DECREF(reader);
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 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	2387
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2388 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	2389 Py_DECREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2390 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	2391 }
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 res;
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2397 xmlparser_setevents(XMLParserObject* self, PyObject* args)
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 /* activate element event reporting */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2400
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2401 Py_ssize_t i;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2402 TreeBuilderObject* target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2403
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2404 PyObject* events; /* event collector */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2405 PyObject* event_set = Py_None;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2406 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	2407 &event_set))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2408 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2409
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2410 if (!TreeBuilder_CheckExact(self->target)) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2411 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2412 PyExc_TypeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2413 "event handling only supported for cElementTree.Treebuilder "
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2414 "targets"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2415 );
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2419 target = (TreeBuilderObject*) self->target;
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 Py_INCREF(events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2422 Py_XDECREF(target->events);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2423 target->events = events;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2424
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2425 /* clear out existing events */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2426 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	2427 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	2428 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	2429 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	2430
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2431 if (event_set == Py_None) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2432 /* default is "end" only */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2433 target->end_event_obj = PyString_FromString("end");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2434 Py_RETURN_NONE;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2435 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2436
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2437 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	2438 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2439
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2440 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	2441 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	2442 char* event;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2443 if (!PyString_Check(item))
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2444 goto error;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2445 event = PyString_AS_STRING(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2446 if (strcmp(event, "start") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2447 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2448 target->start_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2449 } 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	2450 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2451 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	2452 target->end_event_obj = item;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2453 } 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	2454 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2455 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	2456 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	2457 EXPAT(SetNamespaceDeclHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2458 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2459 (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	2460 (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	2461 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2462 } 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	2463 Py_INCREF(item);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2464 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	2465 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	2466 EXPAT(SetNamespaceDeclHandler)(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2467 self->parser,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2468 (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	2469 (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	2470 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2471 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2472 PyErr_Format(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2473 PyExc_ValueError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2474 "unknown event '%s'", event
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2475 );
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2476 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2477 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2478 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2479
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2480 Py_RETURN_NONE;
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 error:
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2483 PyErr_SetString(
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2484 PyExc_TypeError,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2485 "invalid event tuple"
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 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2488 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2489
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2490 static PyMethodDef xmlparser_methods[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2491 {"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	2492 {"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	2493 {"_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	2494 {"_setevents", (PyCFunction) xmlparser_setevents, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2495 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2496 };
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 static PyObject*
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2499 xmlparser_getattr(XMLParserObject* self, char* name)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2500 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2501 PyObject* res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2502
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2503 res = Py_FindMethod(xmlparser_methods, (PyObject*) self, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2504 if (res)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2505 return res;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2506
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2507 PyErr_Clear();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2508
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2509 if (strcmp(name, "entity") == 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2510 res = self->entity;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2511 else if (strcmp(name, "target") == 0)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2512 res = self->target;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2513 else if (strcmp(name, "version") == 0) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2514 char buffer[100];
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2515 sprintf(buffer, "Expat %d.%d.%d", XML_MAJOR_VERSION,
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2516 XML_MINOR_VERSION, XML_MICRO_VERSION);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2517 return PyString_FromString(buffer);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2518 } else {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2519 PyErr_SetString(PyExc_AttributeError, name);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2520 return NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2521 }
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 Py_INCREF(res);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2524 return res;
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
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36954 diff changeset	2527 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	2528 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	2529 "XMLParser", sizeof(XMLParserObject), 0,
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2530 /* methods */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2531 (destructor)xmlparser_dealloc, /* tp_dealloc */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2532 0, /* tp_print */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2533 (getattrfunc)xmlparser_getattr, /* tp_getattr */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2534 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2535
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2536 #endif
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 /* ==================================================================== */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2539 /* python module interface */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2540
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2541 static PyMethodDef _functions[] = {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2542 {"Element", (PyCFunction) element, METH_VARARGS\|METH_KEYWORDS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2543 {"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	2544 {"TreeBuilder", (PyCFunction) treebuilder, METH_VARARGS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2545 #if defined(USE_EXPAT)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2546 {"XMLParser", (PyCFunction) xmlparser, METH_VARARGS\|METH_KEYWORDS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2547 {"XMLTreeBuilder", (PyCFunction) xmlparser, METH_VARARGS\|METH_KEYWORDS},
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2548 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2549 {NULL, NULL}
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2550 };
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2551
40528 bce7e4a926a9 Cruft removal: Neal Norwitz <nnorwitz@gmail.com> parents: 39610 diff changeset	2552 PyMODINIT_FUNC
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	2553 init_elementtree(void)
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2554 {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2555 PyObject* m;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2556 PyObject* g;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2557 char* bootstrap;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2558 #if defined(USE_PYEXPAT_CAPI)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2559 struct PyExpat_CAPI* capi;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2560 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2561
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2562 /* Patch object type */
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	2563 Py_TYPE(&Element_Type) = Py_TYPE(&TreeBuilder_Type) = &PyType_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2564 #if defined(USE_EXPAT)
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	2565 Py_TYPE(&XMLParser_Type) = &PyType_Type;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2566 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2567
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	2568 m = Py_InitModule("_elementtree", _functions);
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2569 if (!m)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2570 return;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2571
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2572 /* python glue code */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2573
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2574 g = PyDict_New();
36954 db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2575 if (!g)
db5e720b0cef merged with cElementTree development trunk (1.0.6 snapshot): Fredrik Lundh <fredrik@pythonware.com> parents: 36684 diff changeset	2576 return;
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2577
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2578 PyDict_SetItemString(g, "__builtins__", PyEval_GetBuiltins());
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2579
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2580 bootstrap = (
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 #if (PY_VERSION_HEX >= 0x02020000 && PY_VERSION_HEX < 0x02030000)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2583 "from __future__ import generators\n" /* enable yield under 2.2 */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2584 #endif
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2585
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2586 "from copy import copy, deepcopy\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2587
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2588 "try:\n"
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	2589 " from xml.etree import ElementTree\n"
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2590 "except ImportError:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2591 " import ElementTree\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2592 "ET = ElementTree\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2593 "del ElementTree\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2594
36051 9b897fb7ac6a updating to cElementTree 1.0.5 (step 3 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: 36050 diff changeset	2595 "import _elementtree as cElementTree\n"
36050 6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2596
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2597 "try:\n" /* check if copy works as is */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2598 " copy(cElementTree.Element('x'))\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2599 "except:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2600 " def copyelement(elem):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2601 " return elem\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2602
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2603 "def Comment(text=None):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2604 " element = cElementTree.Element(ET.Comment)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2605 " element.text = text\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2606 " return element\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2607 "cElementTree.Comment = Comment\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2608
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2609 "class ElementTree(ET.ElementTree):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2610 " def parse(self, source, parser=None):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2611 " if not hasattr(source, 'read'):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2612 " source = open(source, 'rb')\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2613 " if parser is not None:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2614 " while 1:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2615 " data = source.read(65536)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2616 " if not data:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2617 " break\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2618 " parser.feed(data)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2619 " self._root = parser.close()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2620 " else:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2621 " parser = cElementTree.XMLParser()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2622 " self._root = parser._parse(source)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2623 " return self._root\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2624 "cElementTree.ElementTree = ElementTree\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2625
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2626 "def getiterator(node, tag=None):\n" /* helper */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2627 " if tag == '*':\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2628 " tag = None\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2629 #if (PY_VERSION_HEX < 0x02020000)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2630 " nodes = []\n" /* 2.1 doesn't have yield */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2631 " if tag is None or node.tag == tag:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2632 " nodes.append(node)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2633 " for node in node:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2634 " nodes.extend(getiterator(node, tag))\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2635 " return nodes\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2636 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2637 " if tag is None or node.tag == tag:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2638 " yield node\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2639 " for node in node:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2640 " for node in getiterator(node, tag):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2641 " yield node\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2642 #endif
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 "def parse(source, parser=None):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2645 " tree = ElementTree()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2646 " tree.parse(source, parser)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2647 " return tree\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2648 "cElementTree.parse = parse\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2649
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2650 #if (PY_VERSION_HEX < 0x02020000)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2651 "if hasattr(ET, 'iterparse'):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2652 " cElementTree.iterparse = ET.iterparse\n" /* delegate on 2.1 */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2653 #else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2654 "class iterparse(object):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2655 " root = None\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2656 " def __init__(self, file, events=None):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2657 " if not hasattr(file, 'read'):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2658 " file = open(file, 'rb')\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2659 " self._file = file\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2660 " self._events = events\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2661 " def __iter__(self):\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2662 " events = []\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2663 " b = cElementTree.TreeBuilder()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2664 " p = cElementTree.XMLParser(b)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2665 " p._setevents(events, self._events)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2666 " while 1:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2667 " data = self._file.read(16384)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2668 " if not data:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2669 " break\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2670 " p.feed(data)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2671 " for event in events:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2672 " yield event\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2673 " del events[:]\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2674 " root = p.close()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2675 " for event in events:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2676 " yield event\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2677 " self.root = root\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2678 "cElementTree.iterparse = iterparse\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2679 #endif
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 "def PI(target, text=None):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2682 " element = cElementTree.Element(ET.ProcessingInstruction)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2683 " element.text = target\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2684 " if text:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2685 " element.text = element.text + ' ' + text\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2686 " return element\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2687
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2688 " elem = cElementTree.Element(ET.PI)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2689 " elem.text = text\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2690 " return elem\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2691 "cElementTree.PI = cElementTree.ProcessingInstruction = PI\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2692
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2693 "def XML(text):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2694 " parser = cElementTree.XMLParser()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2695 " parser.feed(text)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2696 " return parser.close()\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2697 "cElementTree.XML = cElementTree.fromstring = XML\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2698
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2699 "def XMLID(text):\n" /* public */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2700 " tree = XML(text)\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2701 " ids = {}\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2702 " for elem in tree.getiterator():\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2703 " id = elem.get('id')\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2704 " if id:\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2705 " ids[id] = elem\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2706 " return tree, ids\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2707 "cElementTree.XMLID = XMLID\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2708
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2709 "cElementTree.dump = ET.dump\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2710 "cElementTree.ElementPath = ElementPath = ET.ElementPath\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2711 "cElementTree.iselement = ET.iselement\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2712 "cElementTree.QName = ET.QName\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2713 "cElementTree.tostring = ET.tostring\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2714 "cElementTree.VERSION = '" VERSION "'\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2715 "cElementTree.__version__ = '" VERSION "'\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2716 "cElementTree.XMLParserError = SyntaxError\n"
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2717
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
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2720 PyRun_String(bootstrap, Py_file_input, g, NULL);
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2721
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2722 elementpath_obj = PyDict_GetItemString(g, "ElementPath");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2723
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2724 elementtree_copyelement_obj = PyDict_GetItemString(g, "copyelement");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2725 if (elementtree_copyelement_obj) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2726 /* reduce hack needed; enable reduce method */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2727 PyMethodDef* mp;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2728 for (mp = element_methods; mp->ml_name; mp++)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2729 if (mp->ml_meth == (PyCFunction) element_reduce) {
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2730 mp->ml_name = "__reduce__";
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2731 break;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2732 }
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2733 } else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2734 PyErr_Clear();
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2735 elementtree_deepcopy_obj = PyDict_GetItemString(g, "deepcopy");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2736 elementtree_getiterator_obj = PyDict_GetItemString(g, "getiterator");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2737
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2738 #if defined(USE_PYEXPAT_CAPI)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2739 /* link against pyexpat, if possible */
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2740 capi = PyCObject_Import("pyexpat", "expat_CAPI");
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2741 if (capi &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2742 strcmp(capi->magic, PyExpat_CAPI_MAGIC) == 0 &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2743 capi->size <= sizeof(*expat_capi) &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2744 capi->MAJOR_VERSION == XML_MAJOR_VERSION &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2745 capi->MINOR_VERSION == XML_MINOR_VERSION &&
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2746 capi->MICRO_VERSION == XML_MICRO_VERSION)
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2747 expat_capi = capi;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2748 else
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2749 expat_capi = NULL;
6586cd9920e7 updating to cElementTree 1.0.5 (step 2 of 3) Fredrik Lundh <fredrik@pythonware.com> parents: diff changeset	2750 #endif
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 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_elementtree.c @ 46567:ffeecbebf3ca