Mercurial Repositories > eric / changeset
changeset
Added new Python3 types to XMLWriterBase and XMLHandlerBase.
Sun, 10 Jan 2010 13:59:15 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 10 Jan 2010 13:59:15 +0000
- changeset 44
- fe5cd20cb0eb
- parent 43
- 2fdc635b106a
- child 45
- 9a18f4dbb493
Added new Python3 types to XMLWriterBase and XMLHandlerBase.
--- a/APIs/Python3/eric5.api Sun Jan 10 13:58:01 2010 +0000 +++ b/APIs/Python3/eric5.api Sun Jan 10 13:59:15 2010 +0000 @@ -1438,21 +1438,27 @@ eric5.E4XML.XMLHandlerBase.XMLHandlerBase.defaultEndElement?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.defaultStartElement?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endBool?4() +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endBytearray?4() +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endBytes?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endComplex?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endDictionary?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endElement?4(name) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endFloat?4() +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endFrozenset?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endInt?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endList?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endNone?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endPickle?4() +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endSet?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endString?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.endTuple?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startDictionary?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startDocument?4() eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startElement?4(name, attrs) +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startFrozenset?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startList?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startPickle?4(attrs) +eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startSet?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.startTuple?4(attrs) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.unescape?4(text, attribute = False) eric5.E4XML.XMLHandlerBase.XMLHandlerBase.utf8_to_code?4(text) @@ -1462,16 +1468,18 @@ eric5.E4XML.XMLWriterBase.XMLWriterBase._write?5(s, newline = True) eric5.E4XML.XMLWriterBase.XMLWriterBase._writeBasics?5(pyobject, indent = 0) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_bool?5(value, indent) +eric5.E4XML.XMLWriterBase.XMLWriterBase._write_bytearray?5(value, indent) +eric5.E4XML.XMLWriterBase.XMLWriterBase._write_bytes?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_complex?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_dictionary?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_float?5(value, indent) +eric5.E4XML.XMLWriterBase.XMLWriterBase._write_frozenset?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_int?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_list?5(value, indent) -eric5.E4XML.XMLWriterBase.XMLWriterBase._write_long?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_none?5(value, indent) +eric5.E4XML.XMLWriterBase.XMLWriterBase._write_set?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_string?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_tuple?5(value, indent) -eric5.E4XML.XMLWriterBase.XMLWriterBase._write_unicode?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase._write_unimplemented?5(value, indent) eric5.E4XML.XMLWriterBase.XMLWriterBase.encodedNewLines?4(text) eric5.E4XML.XMLWriterBase.XMLWriterBase.escape?4(data, attribute=False)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DTDs/Basic-5.0.dtd Sun Jan 10 13:59:15 2010 +0000 @@ -0,0 +1,34 @@ +<!-- This is the DTD for eric5's basic marshaller --> + +<!ELEMENT int (#PCDATA)> +<!ELEMENT long (#PCDATA)> +<!ELEMENT float (#PCDATA)> +<!ELEMENT complex (#PCDATA)> +<!ELEMENT bool (#PCDATA)> +<!ELEMENT string (#PCDATA)> +<!ELEMENT bytes (#PCDATA)> +<!ELEMENT bytearray (#PCDATA)> +<!ELEMENT none EMPTY> + +<!ELEMENT pickle (#PCDATA)> +<!ATTLIST pickle + method CDATA #REQUIRED + encoding CDATA #REQUIRED> + +<!ELEMENT key (int | long | float | complex | string | bytes)> +<!ELEMENT value (int | long | float | complex | bool | string | bytes | + bytearray | none | dict | tuple | list | set | frozenset | pickle)> + +<!ELEMENT dict (key, value)*> + +<!ELEMENT tuple (int | long | float | complex | bool | string | bytes | + bytearray | none | dict | tuple | list | set | frozenset | pickle)*> + +<!ELEMENT list (int | long | float | complex | bool | string | bytes | + bytearray | none | dict | tuple | list | set | frozenset | pickle)*> + +<!ELEMENT set (int | long | float | complex | bool | string | bytes | + bytearray | none | dict | tuple | list | set | frozenset | pickle)*> + +<!ELEMENT frozenset (int | long | float | complex | bool | string | bytes | + bytearray | none | dict | tuple | list | set | frozenset | pickle)*>
--- a/Documentation/Help/source.qhp Sun Jan 10 13:58:01 2010 +0000 +++ b/Documentation/Help/source.qhp Sun Jan 10 13:59:15 2010 +0000 @@ -2960,21 +2960,27 @@ <keyword name="XMLHandlerBase.defaultEndElement" id="XMLHandlerBase.defaultEndElement" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.defaultEndElement" /> <keyword name="XMLHandlerBase.defaultStartElement" id="XMLHandlerBase.defaultStartElement" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.defaultStartElement" /> <keyword name="XMLHandlerBase.endBool" id="XMLHandlerBase.endBool" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endBool" /> + <keyword name="XMLHandlerBase.endBytearray" id="XMLHandlerBase.endBytearray" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endBytearray" /> + <keyword name="XMLHandlerBase.endBytes" id="XMLHandlerBase.endBytes" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endBytes" /> <keyword name="XMLHandlerBase.endComplex" id="XMLHandlerBase.endComplex" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endComplex" /> <keyword name="XMLHandlerBase.endDictionary" id="XMLHandlerBase.endDictionary" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endDictionary" /> <keyword name="XMLHandlerBase.endElement" id="XMLHandlerBase.endElement" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endElement" /> <keyword name="XMLHandlerBase.endFloat" id="XMLHandlerBase.endFloat" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endFloat" /> + <keyword name="XMLHandlerBase.endFrozenset" id="XMLHandlerBase.endFrozenset" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endFrozenset" /> <keyword name="XMLHandlerBase.endInt" id="XMLHandlerBase.endInt" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endInt" /> <keyword name="XMLHandlerBase.endList" id="XMLHandlerBase.endList" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endList" /> <keyword name="XMLHandlerBase.endNone" id="XMLHandlerBase.endNone" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endNone" /> <keyword name="XMLHandlerBase.endPickle" id="XMLHandlerBase.endPickle" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endPickle" /> + <keyword name="XMLHandlerBase.endSet" id="XMLHandlerBase.endSet" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endSet" /> <keyword name="XMLHandlerBase.endString" id="XMLHandlerBase.endString" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endString" /> <keyword name="XMLHandlerBase.endTuple" id="XMLHandlerBase.endTuple" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.endTuple" /> <keyword name="XMLHandlerBase.startDictionary" id="XMLHandlerBase.startDictionary" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startDictionary" /> <keyword name="XMLHandlerBase.startDocument" id="XMLHandlerBase.startDocument" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startDocument" /> <keyword name="XMLHandlerBase.startElement" id="XMLHandlerBase.startElement" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startElement" /> + <keyword name="XMLHandlerBase.startFrozenset" id="XMLHandlerBase.startFrozenset" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startFrozenset" /> <keyword name="XMLHandlerBase.startList" id="XMLHandlerBase.startList" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startList" /> <keyword name="XMLHandlerBase.startPickle" id="XMLHandlerBase.startPickle" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startPickle" /> + <keyword name="XMLHandlerBase.startSet" id="XMLHandlerBase.startSet" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startSet" /> <keyword name="XMLHandlerBase.startTuple" id="XMLHandlerBase.startTuple" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.startTuple" /> <keyword name="XMLHandlerBase.unescape" id="XMLHandlerBase.unescape" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.unescape" /> <keyword name="XMLHandlerBase.utf8_to_code" id="XMLHandlerBase.utf8_to_code" ref="eric5.E4XML.XMLHandlerBase.html#XMLHandlerBase.utf8_to_code" /> @@ -3099,16 +3105,18 @@ <keyword name="XMLWriterBase._write" id="XMLWriterBase._write" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write" /> <keyword name="XMLWriterBase._writeBasics" id="XMLWriterBase._writeBasics" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._writeBasics" /> <keyword name="XMLWriterBase._write_bool" id="XMLWriterBase._write_bool" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_bool" /> + <keyword name="XMLWriterBase._write_bytearray" id="XMLWriterBase._write_bytearray" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_bytearray" /> + <keyword name="XMLWriterBase._write_bytes" id="XMLWriterBase._write_bytes" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_bytes" /> <keyword name="XMLWriterBase._write_complex" id="XMLWriterBase._write_complex" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_complex" /> <keyword name="XMLWriterBase._write_dictionary" id="XMLWriterBase._write_dictionary" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_dictionary" /> <keyword name="XMLWriterBase._write_float" id="XMLWriterBase._write_float" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_float" /> + <keyword name="XMLWriterBase._write_frozenset" id="XMLWriterBase._write_frozenset" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_frozenset" /> <keyword name="XMLWriterBase._write_int" id="XMLWriterBase._write_int" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_int" /> <keyword name="XMLWriterBase._write_list" id="XMLWriterBase._write_list" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_list" /> - <keyword name="XMLWriterBase._write_long" id="XMLWriterBase._write_long" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_long" /> <keyword name="XMLWriterBase._write_none" id="XMLWriterBase._write_none" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_none" /> + <keyword name="XMLWriterBase._write_set" id="XMLWriterBase._write_set" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_set" /> <keyword name="XMLWriterBase._write_string" id="XMLWriterBase._write_string" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_string" /> <keyword name="XMLWriterBase._write_tuple" id="XMLWriterBase._write_tuple" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_tuple" /> - <keyword name="XMLWriterBase._write_unicode" id="XMLWriterBase._write_unicode" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_unicode" /> <keyword name="XMLWriterBase._write_unimplemented" id="XMLWriterBase._write_unimplemented" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase._write_unimplemented" /> <keyword name="XMLWriterBase.encodedNewLines" id="XMLWriterBase.encodedNewLines" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase.encodedNewLines" /> <keyword name="XMLWriterBase.escape" id="XMLWriterBase.escape" ref="eric5.E4XML.XMLWriterBase.html#XMLWriterBase.escape" />
--- a/Documentation/Source/eric5.E4XML.XMLHandlerBase.html Sun Jan 10 13:58:01 2010 +0000 +++ b/Documentation/Source/eric5.E4XML.XMLHandlerBase.html Sun Jan 10 13:59:15 2010 +0000 @@ -75,6 +75,12 @@ <td><a href="#XMLHandlerBase.endBool">endBool</a></td> <td>Handler method for the "bool" end tag.</td> </tr><tr> +<td><a href="#XMLHandlerBase.endBytearray">endBytearray</a></td> +<td>Handler method for the "bytearray" end tag.</td> +</tr><tr> +<td><a href="#XMLHandlerBase.endBytes">endBytes</a></td> +<td>Handler method for the "bytes" end tag.</td> +</tr><tr> <td><a href="#XMLHandlerBase.endComplex">endComplex</a></td> <td>Handler method for the "complex" end tag.</td> </tr><tr> @@ -87,6 +93,9 @@ <td><a href="#XMLHandlerBase.endFloat">endFloat</a></td> <td>Handler method for the "float" end tag.</td> </tr><tr> +<td><a href="#XMLHandlerBase.endFrozenset">endFrozenset</a></td> +<td>Handler method for the "frozenset" end tag.</td> +</tr><tr> <td><a href="#XMLHandlerBase.endInt">endInt</a></td> <td>Handler method for the "int" end tag.</td> </tr><tr> @@ -99,6 +108,9 @@ <td><a href="#XMLHandlerBase.endPickle">endPickle</a></td> <td>Handler method for the "pickle" end tag.</td> </tr><tr> +<td><a href="#XMLHandlerBase.endSet">endSet</a></td> +<td>Handler method for the "set" end tag.</td> +</tr><tr> <td><a href="#XMLHandlerBase.endString">endString</a></td> <td>Handler method for the "string" end tag.</td> </tr><tr> @@ -114,12 +126,18 @@ <td><a href="#XMLHandlerBase.startElement">startElement</a></td> <td>Handler called, when a starting tag is found.</td> </tr><tr> +<td><a href="#XMLHandlerBase.startFrozenset">startFrozenset</a></td> +<td>Handler method for the "frozenset" start tag.</td> +</tr><tr> <td><a href="#XMLHandlerBase.startList">startList</a></td> <td>Handler method for the "list" start tag.</td> </tr><tr> <td><a href="#XMLHandlerBase.startPickle">startPickle</a></td> <td>Handler method for the "pickle" start tag.</td> </tr><tr> +<td><a href="#XMLHandlerBase.startSet">startSet</a></td> +<td>Handler method for the "set" start tag.</td> +</tr><tr> <td><a href="#XMLHandlerBase.startTuple">startTuple</a></td> <td>Handler method for the "tuple" start tag.</td> </tr><tr> @@ -180,6 +198,16 @@ <b>endBool</b>(<i></i>) <p> Handler method for the "bool" end tag. +</p><a NAME="XMLHandlerBase.endBytearray" ID="XMLHandlerBase.endBytearray"></a> +<h4>XMLHandlerBase.endBytearray</h4> +<b>endBytearray</b>(<i></i>) +<p> + Handler method for the "bytearray" end tag. +</p><a NAME="XMLHandlerBase.endBytes" ID="XMLHandlerBase.endBytes"></a> +<h4>XMLHandlerBase.endBytes</h4> +<b>endBytes</b>(<i></i>) +<p> + Handler method for the "bytes" end tag. </p><a NAME="XMLHandlerBase.endComplex" ID="XMLHandlerBase.endComplex"></a> <h4>XMLHandlerBase.endComplex</h4> <b>endComplex</b>(<i></i>) @@ -205,6 +233,11 @@ <b>endFloat</b>(<i></i>) <p> Handler method for the "float" end tag. +</p><a NAME="XMLHandlerBase.endFrozenset" ID="XMLHandlerBase.endFrozenset"></a> +<h4>XMLHandlerBase.endFrozenset</h4> +<b>endFrozenset</b>(<i></i>) +<p> + Handler method for the "frozenset" end tag. </p><a NAME="XMLHandlerBase.endInt" ID="XMLHandlerBase.endInt"></a> <h4>XMLHandlerBase.endInt</h4> <b>endInt</b>(<i></i>) @@ -225,6 +258,11 @@ <b>endPickle</b>(<i></i>) <p> Handler method for the "pickle" end tag. +</p><a NAME="XMLHandlerBase.endSet" ID="XMLHandlerBase.endSet"></a> +<h4>XMLHandlerBase.endSet</h4> +<b>endSet</b>(<i></i>) +<p> + Handler method for the "set" end tag. </p><a NAME="XMLHandlerBase.endString" ID="XMLHandlerBase.endString"></a> <h4>XMLHandlerBase.endString</h4> <b>endString</b>(<i></i>) @@ -263,6 +301,16 @@ <dd> list of tag attributes </dd> +</dl><a NAME="XMLHandlerBase.startFrozenset" ID="XMLHandlerBase.startFrozenset"></a> +<h4>XMLHandlerBase.startFrozenset</h4> +<b>startFrozenset</b>(<i>attrs</i>) +<p> + Handler method for the "frozenset" start tag. +</p><dl> +<dt><i>attrs</i></dt> +<dd> +list of tag attributes +</dd> </dl><a NAME="XMLHandlerBase.startList" ID="XMLHandlerBase.startList"></a> <h4>XMLHandlerBase.startList</h4> <b>startList</b>(<i>attrs</i>) @@ -283,6 +331,16 @@ <dd> list of tag attributes </dd> +</dl><a NAME="XMLHandlerBase.startSet" ID="XMLHandlerBase.startSet"></a> +<h4>XMLHandlerBase.startSet</h4> +<b>startSet</b>(<i>attrs</i>) +<p> + Handler method for the "set" start tag. +</p><dl> +<dt><i>attrs</i></dt> +<dd> +list of tag attributes +</dd> </dl><a NAME="XMLHandlerBase.startTuple" ID="XMLHandlerBase.startTuple"></a> <h4>XMLHandlerBase.startTuple</h4> <b>startTuple</b>(<i>attrs</i>)
--- a/Documentation/Source/eric5.E4XML.XMLWriterBase.html Sun Jan 10 13:58:01 2010 +0000 +++ b/Documentation/Source/eric5.E4XML.XMLWriterBase.html Sun Jan 10 13:59:15 2010 +0000 @@ -64,37 +64,43 @@ <td>Protected method to dump an object of a basic Python type.</td> </tr><tr> <td><a href="#XMLWriterBase._write_bool">_write_bool</a></td> -<td>Protected method to dump a BooleanType object.</td> +<td>Protected method to dump a bool object.</td> +</tr><tr> +<td><a href="#XMLWriterBase._write_bytearray">_write_bytearray</a></td> +<td>Protected method to dump a bytearray object.</td> +</tr><tr> +<td><a href="#XMLWriterBase._write_bytes">_write_bytes</a></td> +<td>Protected method to dump a bytes object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_complex">_write_complex</a></td> -<td>Protected method to dump a ComplexType object.</td> +<td>Protected method to dump a complex object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_dictionary">_write_dictionary</a></td> -<td>Protected method to dump a DictType object.</td> +<td>Protected method to dump a dict object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_float">_write_float</a></td> -<td>Protected method to dump a FloatType object.</td> +<td>Protected method to dump a float object.</td> +</tr><tr> +<td><a href="#XMLWriterBase._write_frozenset">_write_frozenset</a></td> +<td>Protected method to dump a frozenset object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_int">_write_int</a></td> -<td>Protected method to dump an IntType object.</td> +<td>Protected method to dump an int object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_list">_write_list</a></td> -<td>Protected method to dump a ListType object.</td> -</tr><tr> -<td><a href="#XMLWriterBase._write_long">_write_long</a></td> -<td>Protected method to dump a LongType object.</td> +<td>Protected method to dump a list object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_none">_write_none</a></td> <td>Protected method to dump a NoneType object.</td> </tr><tr> +<td><a href="#XMLWriterBase._write_set">_write_set</a></td> +<td>Protected method to dump a set object.</td> +</tr><tr> <td><a href="#XMLWriterBase._write_string">_write_string</a></td> -<td>Protected method to dump a StringType object.</td> +<td>Protected method to dump a str object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_tuple">_write_tuple</a></td> -<td>Protected method to dump a TupleType object.</td> -</tr><tr> -<td><a href="#XMLWriterBase._write_unicode">_write_unicode</a></td> -<td>Protected method to dump an UnicodeType object.</td> +<td>Protected method to dump a tuple object.</td> </tr><tr> <td><a href="#XMLWriterBase._write_unimplemented">_write_unimplemented</a></td> <td>Protected method to dump a type, that has no special method.</td> @@ -149,7 +155,7 @@ <h4>XMLWriterBase._write_bool</h4> <b>_write_bool</b>(<i>value, indent</i>) <p> - Protected method to dump a BooleanType object. + Protected method to dump a bool object. </p><dl> <dt><i>value</i></dt> <dd> @@ -158,11 +164,37 @@ <dd> indentation level for prettier output (integer) </dd> +</dl><a NAME="XMLWriterBase._write_bytearray" ID="XMLWriterBase._write_bytearray"></a> +<h4>XMLWriterBase._write_bytearray</h4> +<b>_write_bytearray</b>(<i>value, indent</i>) +<p> + Protected method to dump a bytearray object. +</p><dl> +<dt><i>value</i></dt> +<dd> +value to be dumped (bytearray) +</dd><dt><i>indent</i></dt> +<dd> +indentation level for prettier output (integer) +</dd> +</dl><a NAME="XMLWriterBase._write_bytes" ID="XMLWriterBase._write_bytes"></a> +<h4>XMLWriterBase._write_bytes</h4> +<b>_write_bytes</b>(<i>value, indent</i>) +<p> + Protected method to dump a bytes object. +</p><dl> +<dt><i>value</i></dt> +<dd> +value to be dumped (bytes) +</dd><dt><i>indent</i></dt> +<dd> +indentation level for prettier output (integer) +</dd> </dl><a NAME="XMLWriterBase._write_complex" ID="XMLWriterBase._write_complex"></a> <h4>XMLWriterBase._write_complex</h4> <b>_write_complex</b>(<i>value, indent</i>) <p> - Protected method to dump a ComplexType object. + Protected method to dump a complex object. </p><dl> <dt><i>value</i></dt> <dd> @@ -175,7 +207,7 @@ <h4>XMLWriterBase._write_dictionary</h4> <b>_write_dictionary</b>(<i>value, indent</i>) <p> - Protected method to dump a DictType object. + Protected method to dump a dict object. </p><dl> <dt><i>value</i></dt> <dd> @@ -188,7 +220,7 @@ <h4>XMLWriterBase._write_float</h4> <b>_write_float</b>(<i>value, indent</i>) <p> - Protected method to dump a FloatType object. + Protected method to dump a float object. </p><dl> <dt><i>value</i></dt> <dd> @@ -197,11 +229,24 @@ <dd> indentation level for prettier output (integer) </dd> +</dl><a NAME="XMLWriterBase._write_frozenset" ID="XMLWriterBase._write_frozenset"></a> +<h4>XMLWriterBase._write_frozenset</h4> +<b>_write_frozenset</b>(<i>value, indent</i>) +<p> + Protected method to dump a frozenset object. +</p><dl> +<dt><i>value</i></dt> +<dd> +value to be dumped (frozenset) +</dd><dt><i>indent</i></dt> +<dd> +indentation level for prettier output (integer) +</dd> </dl><a NAME="XMLWriterBase._write_int" ID="XMLWriterBase._write_int"></a> <h4>XMLWriterBase._write_int</h4> <b>_write_int</b>(<i>value, indent</i>) <p> - Protected method to dump an IntType object. + Protected method to dump an int object. </p><dl> <dt><i>value</i></dt> <dd> @@ -214,7 +259,7 @@ <h4>XMLWriterBase._write_list</h4> <b>_write_list</b>(<i>value, indent</i>) <p> - Protected method to dump a ListType object. + Protected method to dump a list object. </p><dl> <dt><i>value</i></dt> <dd> @@ -223,19 +268,6 @@ <dd> indentation level for prettier output (integer) </dd> -</dl><a NAME="XMLWriterBase._write_long" ID="XMLWriterBase._write_long"></a> -<h4>XMLWriterBase._write_long</h4> -<b>_write_long</b>(<i>value, indent</i>) -<p> - Protected method to dump a LongType object. -</p><dl> -<dt><i>value</i></dt> -<dd> -value to be dumped (long) -</dd><dt><i>indent</i></dt> -<dd> -indentation level for prettier output (integer) -</dd> </dl><a NAME="XMLWriterBase._write_none" ID="XMLWriterBase._write_none"></a> <h4>XMLWriterBase._write_none</h4> <b>_write_none</b>(<i>value, indent</i>) @@ -249,11 +281,24 @@ <dd> indentation level for prettier output (integer) </dd> +</dl><a NAME="XMLWriterBase._write_set" ID="XMLWriterBase._write_set"></a> +<h4>XMLWriterBase._write_set</h4> +<b>_write_set</b>(<i>value, indent</i>) +<p> + Protected method to dump a set object. +</p><dl> +<dt><i>value</i></dt> +<dd> +value to be dumped (set) +</dd><dt><i>indent</i></dt> +<dd> +indentation level for prettier output (integer) +</dd> </dl><a NAME="XMLWriterBase._write_string" ID="XMLWriterBase._write_string"></a> <h4>XMLWriterBase._write_string</h4> <b>_write_string</b>(<i>value, indent</i>) <p> - Protected method to dump a StringType object. + Protected method to dump a str object. </p><dl> <dt><i>value</i></dt> <dd> @@ -266,7 +311,7 @@ <h4>XMLWriterBase._write_tuple</h4> <b>_write_tuple</b>(<i>value, indent</i>) <p> - Protected method to dump a TupleType object. + Protected method to dump a tuple object. </p><dl> <dt><i>value</i></dt> <dd> @@ -275,19 +320,6 @@ <dd> indentation level for prettier output (integer) </dd> -</dl><a NAME="XMLWriterBase._write_unicode" ID="XMLWriterBase._write_unicode"></a> -<h4>XMLWriterBase._write_unicode</h4> -<b>_write_unicode</b>(<i>value, indent</i>) -<p> - Protected method to dump an UnicodeType object. -</p><dl> -<dt><i>value</i></dt> -<dd> -value to be dumped (unicode) -</dd><dt><i>indent</i></dt> -<dd> -indentation level for prettier output (integer) -</dd> </dl><a NAME="XMLWriterBase._write_unimplemented" ID="XMLWriterBase._write_unimplemented"></a> <h4>XMLWriterBase._write_unimplemented</h4> <b>_write_unimplemented</b>(<i>value, indent</i>)
--- a/E4XML/XMLHandlerBase.py Sun Jan 10 13:58:01 2010 +0000 +++ b/E4XML/XMLHandlerBase.py Sun Jan 10 13:59:15 2010 +0000 @@ -25,19 +25,23 @@ # TODO: add support for bytes, bytearray, set, frozenset self.elements = { - 'none' : (self.defaultStartElement, self.endNone), - 'int' : (self.defaultStartElement, self.endInt), - 'float' : (self.defaultStartElement, self.endFloat), - 'complex' : (self.defaultStartElement, self.endComplex), - 'bool' : (self.defaultStartElement, self.endBool), - 'string' : (self.defaultStartElement, self.endString), - 'tuple' : (self.startTuple, self.endTuple), - 'list' : (self.startList, self.endList), - 'dict' : (self.startDictionary, self.endDictionary), - 'pickle' : (self.startPickle, self.endPickle), + 'none' : (self.defaultStartElement, self.endNone), + 'int' : (self.defaultStartElement, self.endInt), + 'float' : (self.defaultStartElement, self.endFloat), + 'complex' : (self.defaultStartElement, self.endComplex), + 'bool' : (self.defaultStartElement, self.endBool), + 'string' : (self.defaultStartElement, self.endString), + 'bytes' : (self.defaultStartElement, self.endBytes), + 'bytearray' : (self.defaultStartElement, self.endBytearray), + 'tuple' : (self.startTuple, self.endTuple), + 'list' : (self.startList, self.endList), + 'dict' : (self.startDictionary, self.endDictionary), + 'set' : (self.startSet, self.endSet), + 'frozenset' : (self.startFrozenset, self.endFrozenset), + 'pickle' : (self.startPickle, self.endPickle), # for backward compatibility - 'long' : (self.defaultStartElement, self.endInt), - 'unicode' : (self.defaultStartElement, self.endString), + 'long' : (self.defaultStartElement, self.endInt), + 'unicode' : (self.defaultStartElement, self.endString), } self.buffer = "" @@ -183,6 +187,19 @@ s = str(self.utf8_to_code(self.unescape(self.buffer))) self.stack.append(s) + def endBytes(self): + """ + Handler method for the "bytes" end tag. + """ + by = bytes([int(b) for b in self.buffer.strip().split(",")]) + self.stack.append(by) + + def endBytearray(self): + """ + Handler method for the "bytearray" end tag. + """ + by = bytearray([int(b) for b in self.buffer.strip().split(",")]) + self.stack.append(by) ## def endUnicode(self): ## """ ## Handler method for the "unicode" end tag. @@ -197,7 +214,6 @@ @param attrs list of tag attributes """ self.stack.append(self._marker) - self.stack.append([]) def endList(self): """ @@ -207,8 +223,7 @@ if self.stack[i] is self._marker: break assert i != -1 - l = self.stack[i + 1] - l[:] = self.stack[i + 2:len(self.stack)] + l = self.stack[i + 1:len(self.stack)] self.stack[i:] = [l] def startTuple(self, attrs): @@ -237,7 +252,6 @@ @param attrs list of tag attributes """ self.stack.append(self._marker) - self.stack.append({}) def endDictionary(self): """ @@ -247,11 +261,49 @@ if self.stack[i] is self._marker: break assert i != -1 - d = self.stack[i + 1] - for j in range(i + 2, len(self.stack), 2): + d = {} + for j in range(i + 1, len(self.stack), 2): d[self.stack[j]] = self.stack[j + 1] self.stack[i:] = [d] + def startSet(self, attrs): + """ + Handler method for the "set" start tag. + + @param attrs list of tag attributes + """ + self.stack.append(self._marker) + + def endSet(self): + """ + Handler method for the "set" end tag. + """ + for i in range(len(self.stack) - 1, -1, -1): + if self.stack[i] is self._marker: + break + assert i != -1 + s = set(self.stack[i + 1:len(self.stack)]) + self.stack[i:] = [s] + + def startFrozenset(self, attrs): + """ + Handler method for the "frozenset" start tag. + + @param attrs list of tag attributes + """ + self.stack.append(self._marker) + + def endFrozenset(self): + """ + Handler method for the "frozenset" end tag. + """ + for i in range(len(self.stack) - 1, -1, -1): + if self.stack[i] is self._marker: + break + assert i != -1 + f = frozenset(self.stack[i + 1:len(self.stack)]) + self.stack[i:] = [f] + def startPickle(self, attrs): """ Handler method for the "pickle" start tag.
--- a/E4XML/XMLWriterBase.py Sun Jan 10 13:58:01 2010 +0000 +++ b/E4XML/XMLWriterBase.py Sun Jan 10 13:59:15 2010 +0000 @@ -24,15 +24,18 @@ self.basics = { type(None) : self._write_none, - type(1) : self._write_int, - type(1.1) : self._write_float, - type(1+1j) : self._write_complex, - type(True) : self._write_bool, - type("") : self._write_string, -## UnicodeType : self._write_unicode, # should be bytes - type((1,)) : self._write_tuple, - type([]) : self._write_list, - type({}) : self._write_dictionary, + int : self._write_int, + float : self._write_float, + complex : self._write_complex, + bool : self._write_bool, + str : self._write_string, + bytes : self._write_bytes, + bytearray : self._write_bytearray, + tuple : self._write_tuple, + list : self._write_list, + dict : self._write_dictionary, + set : self._write_set, + frozenset : self._write_frozenset, # TODO: add set, frozenset, bytes, bytearray } @@ -107,7 +110,7 @@ def _write_int(self, value, indent): """ - Protected method to dump an IntType object. + Protected method to dump an int object. @param value value to be dumped (integer) @param indent indentation level for prettier output (integer) @@ -116,7 +119,7 @@ def _write_bool(self, value, indent): """ - Protected method to dump a BooleanType object. + Protected method to dump a bool object. @param value value to be dumped (boolean) @param indent indentation level for prettier output (integer) @@ -125,7 +128,7 @@ def _write_float(self, value, indent): """ - Protected method to dump a FloatType object. + Protected method to dump a float object. @param value value to be dumped (float) @param indent indentation level for prettier output (integer) @@ -134,7 +137,7 @@ def _write_complex(self, value, indent): """ - Protected method to dump a ComplexType object. + Protected method to dump a complex object. @param value value to be dumped (complex) @param indent indentation level for prettier output (integer) @@ -144,16 +147,36 @@ def _write_string(self, value, indent): """ - Protected method to dump a StringType object. + Protected method to dump a str object. @param value value to be dumped (string) @param indent indentation level for prettier output (integer) """ self._write('%s<string>%s</string>' % (" " * indent, self.escape(value))) + def _write_bytes(self, value, indent): + """ + Protected method to dump a bytes object. + + @param value value to be dumped (bytes) + @param indent indentation level for prettier output (integer) + """ + self._write('%s<bytes>%s</bytes>' % ( + " " * indent, ",".join(["%d" % b for b in value]))) + + def _write_bytearray(self, value, indent): + """ + Protected method to dump a bytearray object. + + @param value value to be dumped (bytearray) + @param indent indentation level for prettier output (integer) + """ + self._write('%s<bytearray>%s</bytearray>' % ( + " " * indent, ",".join(["%d" % b for b in value]))) + def _write_tuple(self, value, indent): """ - Protected method to dump a TupleType object. + Protected method to dump a tuple object. @param value value to be dumped (tuple) @param indent indentation level for prettier output (integer) @@ -166,7 +189,7 @@ def _write_list(self, value, indent): """ - Protected method to dump a ListType object. + Protected method to dump a list object. @param value value to be dumped (list) @param indent indentation level for prettier output (integer) @@ -179,7 +202,7 @@ def _write_dictionary(self, value, indent): """ - Protected method to dump a DictType object. + Protected method to dump a dict object. @param value value to be dumped (dictionary) @param indent indentation level for prettier output (integer) @@ -197,6 +220,32 @@ self._write('%s</value>' % (" " * nindent1)) self._write('%s</dict>' % (" " * indent)) + def _write_set(self, value, indent): + """ + Protected method to dump a set object. + + @param value value to be dumped (set) + @param indent indentation level for prettier output (integer) + """ + self._write('%s<set>' % (" " * indent)) + nindent = indent + 1 + for elem in value: + self._writeBasics(elem, nindent) + self._write('%s</set>' % (" " * indent)) + + def _write_frozenset(self, value, indent): + """ + Protected method to dump a frozenset object. + + @param value value to be dumped (frozenset) + @param indent indentation level for prettier output (integer) + """ + self._write('%s<frozenset>' % (" " * indent)) + nindent = indent + 1 + for elem in value: + self._writeBasics(elem, nindent) + self._write('%s</frozenset>' % (" " * indent)) + def _write_unimplemented(self, value, indent): """ Protected method to dump a type, that has no special method.
