Issue 8047: Serialiser in ElementTree returns unicode strings in Py3k

See: http://bugs.python.org/issue8047

[flox, 2010-03-22 08:41:37]

issue8047_etree_encoding.diff

[flox, 2010-03-22 10:06:05]

Proposed changes, according to Fredrik's comments.
http://bugs.python.org/issue8047#msg101427

http://codereview.appspot.com/664043/diff/3001/4001
File Doc/library/xml.etree.elementtree.rst (right):

http://codereview.appspot.com/664043/diff/3001/4001#newcode155
Doc/library/xml.etree.elementtree.rst:155: the output encoding (default is
US-ASCII).  Use ``encoding=False`` to
Proposal: change to ``encoding='unicode'``

Same comment for tostringlist() and ET.write().

http://codereview.appspot.com/664043/diff/3001/4002
File Lib/test/test_xml_etree.py (right):

http://codereview.appspot.com/664043/diff/3001/4002#newcode68
Lib/test/test_xml_etree.py:68: def serialize(elem, to_string=True,
encoding=False, **options):
... encoding='unicode' ...

http://codereview.appspot.com/664043/diff/3001/4002#newcode70
Lib/test/test_xml_etree.py:70: if encoding is not False:
--> if encoding != 'unicode':

http://codereview.appspot.com/664043/diff/3001/4002#newcode584
Lib/test/test_xml_etree.py:584: >>> tree.write(sys.stdout, encoding=False)
... encoding='unicode')

(and the same for others below)

http://codereview.appspot.com/664043/diff/3001/4003
File Lib/xml/etree/ElementTree.py (right):

http://codereview.appspot.com/664043/diff/3001/4003#newcode796
Lib/xml/etree/ElementTree.py:796: #     Use False to return a Unicode string.
--> Use 'unicode' to return a Unicode string.

http://codereview.appspot.com/664043/diff/3001/4003#newcode815
Lib/xml/etree/ElementTree.py:815: if encoding in (None, True):
--> if not encoding:

http://codereview.appspot.com/664043/diff/3001/4003#newcode821
Lib/xml/etree/ElementTree.py:821: encoding = False
--> encoding = 'unicode'

http://codereview.appspot.com/664043/diff/3001/4003#newcode825
Lib/xml/etree/ElementTree.py:825: if encoding:
--> if encoding != 'unicode':

http://codereview.appspot.com/664043/diff/3001/4003#newcode839
Lib/xml/etree/ElementTree.py:839: encoding and encoding not in ("utf-8",
"us-ascii"))):
For Unicode output, do we write the xml_declaration by default?
I would say no.

http://codereview.appspot.com/664043/diff/3001/4003#newcode841
Lib/xml/etree/ElementTree.py:841: if not encoding:
--> if encoding == 'unicode':
Needed for xml_declaration=True.
Maybe we could accept an encoding as argument. Example:
  xml_declaration='utf-8'

http://codereview.appspot.com/664043/diff/3001/4003#newcode1154
Lib/xml/etree/ElementTree.py:1154: if encoding:
--> if encoding in (str, 'unicode'):

(and remove the lines 1150-1153)

http://codereview.appspot.com/664043/diff/3001/4003#newcode1195
Lib/xml/etree/ElementTree.py:1195: elem.write(sys.stdout, encoding=False)
--> encoding='unicode'

Because sys.stdout wants unicode.

[flox, 2010-07-31 16:43:04]

Use encoding="unicode"