mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
[3.9] gh-91810: Expand ElementTree.write() tests to use non-ASCII data (GH-91989). (GH-91994)
(cherry picked from commit f60b4c3d74)
This commit is contained in:
Serhiy Storchaka
GitHub
parent
24ce12366f
commit
993bb1632b
1 changed files with 80 additions and 17 deletions
|
|
@ -112,6 +112,9 @@ def newtest(*args, **kwargs):
|
|||
return newtest
|
||||
return decorator
|
||||
|
||||
def convlinesep(data):
|
||||
return data.replace(b'\n', os.linesep.encode())
|
||||
|
||||
|
||||
class ModuleTest(unittest.TestCase):
|
||||
def test_sanity(self):
|
||||
|
|
@ -3654,32 +3657,92 @@ def test_encoding(self):
|
|||
|
||||
def test_write_to_filename(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
tree.write(TESTFN)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site />''')
|
||||
self.assertEqual(f.read(), b'''<site>ø</site>''')
|
||||
|
||||
def test_write_to_filename_with_encoding(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
tree.write(TESTFN, encoding='utf-8')
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site>\xc3\xb8</site>''')
|
||||
|
||||
tree.write(TESTFN, encoding='ISO-8859-1')
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), convlinesep(
|
||||
b'''<?xml version='1.0' encoding='ISO-8859-1'?>\n'''
|
||||
b'''<site>\xf8</site>'''))
|
||||
|
||||
def test_write_to_filename_as_unicode(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
with open(TESTFN, 'w') as f:
|
||||
encoding = f.encoding
|
||||
support.unlink(TESTFN)
|
||||
|
||||
try:
|
||||
'\xf8'.encode(encoding)
|
||||
except UnicodeEncodeError:
|
||||
self.skipTest(f'default file encoding {encoding} not supported')
|
||||
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
tree.write(TESTFN, encoding='unicode')
|
||||
with open(TESTFN, 'rb') as f:
|
||||
data = f.read()
|
||||
expected = "<site>\xf8</site>".encode(encoding, 'xmlcharrefreplace')
|
||||
self.assertEqual(data, expected)
|
||||
|
||||
def test_write_to_text_file(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
with open(TESTFN, 'w', encoding='utf-8') as f:
|
||||
tree.write(f, encoding='unicode')
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site />''')
|
||||
self.assertEqual(f.read(), b'''<site>\xc3\xb8</site>''')
|
||||
|
||||
with open(TESTFN, 'w', encoding='ascii', errors='xmlcharrefreplace') as f:
|
||||
tree.write(f, encoding='unicode')
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site>ø</site>''')
|
||||
|
||||
with open(TESTFN, 'w', encoding='ISO-8859-1') as f:
|
||||
tree.write(f, encoding='unicode')
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site>\xf8</site>''')
|
||||
|
||||
def test_write_to_binary_file(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
with open(TESTFN, 'wb') as f:
|
||||
tree.write(f)
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site />''')
|
||||
self.assertEqual(f.read(), b'''<site>ø</site>''')
|
||||
|
||||
def test_write_to_binary_file_with_encoding(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
with open(TESTFN, 'wb') as f:
|
||||
tree.write(f, encoding='utf-8')
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(), b'''<site>\xc3\xb8</site>''')
|
||||
|
||||
with open(TESTFN, 'wb') as f:
|
||||
tree.write(f, encoding='ISO-8859-1')
|
||||
self.assertFalse(f.closed)
|
||||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(),
|
||||
b'''<?xml version='1.0' encoding='ISO-8859-1'?>\n'''
|
||||
b'''<site>\xf8</site>''')
|
||||
|
||||
def test_write_to_binary_file_with_bom(self):
|
||||
self.addCleanup(support.unlink, TESTFN)
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
# test BOM writing to buffered file
|
||||
with open(TESTFN, 'wb') as f:
|
||||
tree.write(f, encoding='utf-16')
|
||||
|
|
@ -3687,7 +3750,7 @@ def test_write_to_binary_file_with_bom(self):
|
|||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(),
|
||||
'''<?xml version='1.0' encoding='utf-16'?>\n'''
|
||||
'''<site />'''.encode("utf-16"))
|
||||
'''<site>\xf8</site>'''.encode("utf-16"))
|
||||
# test BOM writing to non-buffered file
|
||||
with open(TESTFN, 'wb', buffering=0) as f:
|
||||
tree.write(f, encoding='utf-16')
|
||||
|
|
@ -3695,7 +3758,7 @@ def test_write_to_binary_file_with_bom(self):
|
|||
with open(TESTFN, 'rb') as f:
|
||||
self.assertEqual(f.read(),
|
||||
'''<?xml version='1.0' encoding='utf-16'?>\n'''
|
||||
'''<site />'''.encode("utf-16"))
|
||||
'''<site>\xf8</site>'''.encode("utf-16"))
|
||||
|
||||
def test_read_from_stringio(self):
|
||||
tree = ET.ElementTree()
|
||||
|
|
@ -3704,10 +3767,10 @@ def test_read_from_stringio(self):
|
|||
self.assertEqual(tree.getroot().tag, 'site')
|
||||
|
||||
def test_write_to_stringio(self):
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
stream = io.StringIO()
|
||||
tree.write(stream, encoding='unicode')
|
||||
self.assertEqual(stream.getvalue(), '''<site />''')
|
||||
self.assertEqual(stream.getvalue(), '''<site>\xf8</site>''')
|
||||
|
||||
def test_read_from_bytesio(self):
|
||||
tree = ET.ElementTree()
|
||||
|
|
@ -3716,10 +3779,10 @@ def test_read_from_bytesio(self):
|
|||
self.assertEqual(tree.getroot().tag, 'site')
|
||||
|
||||
def test_write_to_bytesio(self):
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
raw = io.BytesIO()
|
||||
tree.write(raw)
|
||||
self.assertEqual(raw.getvalue(), b'''<site />''')
|
||||
self.assertEqual(raw.getvalue(), b'''<site>ø</site>''')
|
||||
|
||||
class dummy:
|
||||
pass
|
||||
|
|
@ -3733,12 +3796,12 @@ def test_read_from_user_text_reader(self):
|
|||
self.assertEqual(tree.getroot().tag, 'site')
|
||||
|
||||
def test_write_to_user_text_writer(self):
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
stream = io.StringIO()
|
||||
writer = self.dummy()
|
||||
writer.write = stream.write
|
||||
tree.write(writer, encoding='unicode')
|
||||
self.assertEqual(stream.getvalue(), '''<site />''')
|
||||
self.assertEqual(stream.getvalue(), '''<site>\xf8</site>''')
|
||||
|
||||
def test_read_from_user_binary_reader(self):
|
||||
raw = io.BytesIO(b'''<?xml version="1.0"?><site></site>''')
|
||||
|
|
@ -3750,12 +3813,12 @@ def test_read_from_user_binary_reader(self):
|
|||
tree = ET.ElementTree()
|
||||
|
||||
def test_write_to_user_binary_writer(self):
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
|
||||
raw = io.BytesIO()
|
||||
writer = self.dummy()
|
||||
writer.write = raw.write
|
||||
tree.write(writer)
|
||||
self.assertEqual(raw.getvalue(), b'''<site />''')
|
||||
self.assertEqual(raw.getvalue(), b'''<site>ø</site>''')
|
||||
|
||||
def test_write_to_user_binary_writer_with_bom(self):
|
||||
tree = ET.ElementTree(ET.XML('''<site />'''))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue