mirror of https://github.com/python/cpython
Issue #17606: Fixed support of encoded byte strings in the XMLGenerator
characters() and ignorableWhitespace() methods. Original patch by Sebastian Ortiz Vasquez.
This commit is contained in:
parent
521ed52131
commit
3eab6b363a
|
@ -319,6 +319,24 @@ class XmlgenTest:
|
|||
|
||||
self.assertEqual(result.getvalue(), self.xml("<doc> </doc>"))
|
||||
|
||||
def test_xmlgen_encoding_bytes(self):
|
||||
encodings = ('iso-8859-15', 'utf-8', 'utf-8-sig',
|
||||
'utf-16', 'utf-16be', 'utf-16le',
|
||||
'utf-32', 'utf-32be', 'utf-32le')
|
||||
for encoding in encodings:
|
||||
result = self.ioclass()
|
||||
gen = XMLGenerator(result, encoding=encoding)
|
||||
|
||||
gen.startDocument()
|
||||
gen.startElement("doc", {"a": '\u20ac'})
|
||||
gen.characters("\u20ac".encode(encoding))
|
||||
gen.ignorableWhitespace(" ".encode(encoding))
|
||||
gen.endElement("doc")
|
||||
gen.endDocument()
|
||||
|
||||
self.assertEqual(result.getvalue(),
|
||||
self.xml('<doc a="\u20ac">\u20ac </doc>', encoding=encoding))
|
||||
|
||||
def test_xmlgen_ns(self):
|
||||
result = self.ioclass()
|
||||
gen = XMLGenerator(result)
|
||||
|
|
|
@ -209,11 +209,15 @@ class XMLGenerator(handler.ContentHandler):
|
|||
def characters(self, content):
|
||||
if content:
|
||||
self._finish_pending_start_element()
|
||||
if not isinstance(content, str):
|
||||
content = str(content, self._encoding)
|
||||
self._write(escape(content))
|
||||
|
||||
def ignorableWhitespace(self, content):
|
||||
if content:
|
||||
self._finish_pending_start_element()
|
||||
if not isinstance(content, str):
|
||||
content = str(content, self._encoding)
|
||||
self._write(content)
|
||||
|
||||
def processingInstruction(self, target, data):
|
||||
|
|
|
@ -1254,6 +1254,7 @@ Kyle VanderBeek
|
|||
Andrew Vant
|
||||
Atul Varma
|
||||
Dmitry Vasiliev
|
||||
Sebastian Ortiz Vasquez
|
||||
Alexandre Vassalotti
|
||||
Nadeem Vawda
|
||||
Frank Vercruesse
|
||||
|
|
|
@ -49,6 +49,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #17606: Fixed support of encoded byte strings in the XMLGenerator
|
||||
.characters() and ignorableWhitespace() methods. Original patch by Sebastian
|
||||
Ortiz Vasquez.
|
||||
|
||||
- Issue #17732: Ignore distutils.cfg options pertaining to install paths if a
|
||||
virtual environment is active.
|
||||
|
||||
|
|
Loading…
Reference in New Issue