summaryrefslogtreecommitdiffstats
path: root/Lib/xml/etree/ElementTree.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-02-09 16:51:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-02-09 16:51:16 (GMT)
commitc77dd32be4557ad5d2e5c9a710ebeaf52d5092d1 (patch)
treef77e45403d9f7dc9ad863caacb9928d6fd90fc90 /Lib/xml/etree/ElementTree.py
parent28a817e3bacd1de1fbca2d0cd8f2f7dd3cc72b61 (diff)
downloadcpython-c77dd32be4557ad5d2e5c9a710ebeaf52d5092d1.zip
cpython-c77dd32be4557ad5d2e5c9a710ebeaf52d5092d1.tar.gz
cpython-c77dd32be4557ad5d2e5c9a710ebeaf52d5092d1.tar.bz2
Issue #6233: ElementTree failed converting unicode characters to XML
entities when they could't be represented in the requested output encoding. Patch by Jerry Chen.
Diffstat (limited to 'Lib/xml/etree/ElementTree.py')
-rw-r--r--Lib/xml/etree/ElementTree.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index cfac4f7..c47573e 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -662,9 +662,9 @@ class ElementTree:
# write XML to file
tag = node.tag
if tag is Comment:
- file.write(_encode("<!-- %s -->" % _escape_cdata(node.text), encoding))
+ file.write(b"<!-- " + _encode_cdata(node.text, encoding) + b" -->")
elif tag is ProcessingInstruction:
- file.write(_encode("<?%s?>" % _escape_cdata(node.text), encoding))
+ file.write(b"<?" + _encode_cdata(node.text, encoding) + b"?>")
else:
items = list(node.items())
xmlns_items = [] # new namespaces in this scope
@@ -696,7 +696,7 @@ class ElementTree:
if node.text or len(node):
file.write(_encode(">", encoding))
if node.text:
- file.write(_encode(_escape_cdata(node.text), encoding))
+ file.write(_encode_cdata(node.text, encoding))
for n in node:
self._write(file, n, encoding, namespaces)
file.write(_encode("</" + tag + ">", encoding))
@@ -705,7 +705,7 @@ class ElementTree:
for k, v in xmlns_items:
del namespaces[v]
if node.tail:
- file.write(_encode(_escape_cdata(node.tail), encoding))
+ file.write(_encode_cdata(node.tail, encoding))
# --------------------------------------------------------------------
# helpers
@@ -788,13 +788,16 @@ def _encode_entity(text, pattern=_escape):
# the following functions assume an ascii-compatible encoding
# (or "utf-16")
-def _escape_cdata(text):
+def _encode_cdata(text, encoding):
# escape character data
try:
text = text.replace("&", "&amp;")
text = text.replace("<", "&lt;")
text = text.replace(">", "&gt;")
- return text
+ if encoding:
+ return text.encode(encoding, "xmlcharrefreplace")
+ else:
+ return text
except (TypeError, AttributeError):
_raise_serialization_error(text)