Skip to content

Commit 7423903

Browse files
Issue python#17606: Fixed support of encoded byte strings in the XMLGenerator
characters() and ignorableWhitespace() methods. Original patch by Sebastian Ortiz Vasquez.
1 parent 988aba3 commit 7423903

4 files changed

Lines changed: 31 additions & 2 deletions

File tree

‎Lib/test/test_sax.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,26 @@ def test_xmlgen_ignorable(self):
284284

285285
self.assertEqual(result.getvalue(), start + "<doc> </doc>")
286286

287+
def test_xmlgen_encoding_bytes(self):
288+
encodings = ('iso-8859-15', 'utf-8',
289+
'utf-16be', 'utf-16le',
290+
'utf-32be', 'utf-32le')
291+
for encoding in encodings:
292+
result = self.ioclass()
293+
gen = XMLGenerator(result, encoding=encoding)
294+
295+
gen.startDocument()
296+
gen.startElement("doc", {"a": u'\u20ac'})
297+
gen.characters(u"\u20ac".encode(encoding))
298+
gen.ignorableWhitespace(" ".encode(encoding))
299+
gen.endElement("doc")
300+
gen.endDocument()
301+
302+
self.assertEqual(result.getvalue(), (
303+
u'<?xml version="1.0" encoding="%s"?>\n'
304+
u'<doc a="\u20ac">\u20ac </doc>' % encoding
305+
).encode(encoding, 'xmlcharrefreplace'))
306+
287307
def test_xmlgen_ns(self):
288308
result = self.ioclass()
289309
gen = XMLGenerator(result)

‎Lib/xml/sax/saxutils.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,14 @@ def endElementNS(self, name, qname):
180180
self._write(u'</%s>' % self._qname(name))
181181

182182
def characters(self, content):
183-
self._write(escape(unicode(content)))
183+
if not isinstance(content, unicode):
184+
content = unicode(content, self._encoding)
185+
self._write(escape(content))
184186

185187
def ignorableWhitespace(self, content):
186-
self._write(unicode(content))
188+
if not isinstance(content, unicode):
189+
content = unicode(content, self._encoding)
190+
self._write(content)
187191

188192
def processingInstruction(self, target, data):
189193
self._write(u'<?%s %s?>' % (target, data))

‎Misc/ACKS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,7 @@ Case Van Horsen
10451045
Kyle VanderBeek
10461046
Atul Varma
10471047
Dmitry Vasiliev
1048+
Sebastian Ortiz Vasquez
10481049
Alexandre Vassalotti
10491050
Frank Vercruesse
10501051
Mike Verdone

‎Misc/NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Core and Builtins
3838
Library
3939
-------
4040

41+
- Issue #17606: Fixed support of encoded byte strings in the XMLGenerator
42+
.characters() and ignorableWhitespace() methods. Original patch by Sebastian
43+
Ortiz Vasquez.
44+
4145
- Issue #16601: Restarting iteration over tarfile no more continues from where
4246
it left off. Patch by Michael Birtwell.
4347

0 commit comments

Comments
 (0)