summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2013-05-25 14:12:38 (GMT)
committerEli Bendersky <eliben@gmail.com>2013-05-25 14:12:38 (GMT)
commit8be90396f2a6b9896c7e383b28c2a3ce3a16baf2 (patch)
tree818d57bec6c713af71885824d1b23c4e4f13fa9d
parent7b3022f24f4bb8c64d02e103de3168e96729bdc2 (diff)
parent4ace240fe59ce5b1a4a3f4df03ef72b5bd3a5b71 (diff)
downloadcpython-8be90396f2a6b9896c7e383b28c2a3ce3a16baf2.zip
cpython-8be90396f2a6b9896c7e383b28c2a3ce3a16baf2.tar.gz
cpython-8be90396f2a6b9896c7e383b28c2a3ce3a16baf2.tar.bz2
Clean-up duplicated code in tests
-rw-r--r--Lib/test/test_xml_etree.py46
1 files changed, 0 insertions, 46 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 2ec3322..6c5bf02 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -727,52 +727,6 @@ class ElementTreeTest(unittest.TestCase):
self.assertRaises(ValueError, ET.XML, xml('undefined').encode('ascii'))
self.assertRaises(LookupError, ET.XML, xml('xxx').encode('ascii'))
- def xml(encoding):
- return "<?xml version='1.0' encoding='%s'?><xml />" % encoding
- def bxml(encoding):
- return xml(encoding).encode(encoding)
- supported_encodings = [
- 'ascii', 'utf-8', 'utf-8-sig', 'utf-16', 'utf-16be', 'utf-16le',
- 'iso8859-1', 'iso8859-2', 'iso8859-3', 'iso8859-4', 'iso8859-5',
- 'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9', 'iso8859-10',
- 'iso8859-13', 'iso8859-14', 'iso8859-15', 'iso8859-16',
- 'cp437', 'cp720', 'cp737', 'cp775', 'cp850', 'cp852',
- 'cp855', 'cp856', 'cp857', 'cp858', 'cp860', 'cp861', 'cp862',
- 'cp863', 'cp865', 'cp866', 'cp869', 'cp874', 'cp1006', 'cp1250',
- 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255', 'cp1256',
- 'cp1257', 'cp1258',
- 'mac-cyrillic', 'mac-greek', 'mac-iceland', 'mac-latin2',
- 'mac-roman', 'mac-turkish',
- 'iso2022-jp', 'iso2022-jp-1', 'iso2022-jp-2', 'iso2022-jp-2004',
- 'iso2022-jp-3', 'iso2022-jp-ext',
- 'koi8-r', 'koi8-u',
- 'hz', 'ptcp154',
- ]
- for encoding in supported_encodings:
- self.assertEqual(ET.tostring(ET.XML(bxml(encoding))), b'<xml />')
-
- unsupported_ascii_compatible_encodings = [
- 'big5', 'big5hkscs',
- 'cp932', 'cp949', 'cp950',
- 'euc-jp', 'euc-jis-2004', 'euc-jisx0213', 'euc-kr',
- 'gb2312', 'gbk', 'gb18030',
- 'iso2022-kr', 'johab',
- 'shift-jis', 'shift-jis-2004', 'shift-jisx0213',
- 'utf-7',
- ]
- for encoding in unsupported_ascii_compatible_encodings:
- self.assertRaises(ValueError, ET.XML, bxml(encoding))
-
- unsupported_ascii_incompatible_encodings = [
- 'cp037', 'cp424', 'cp500', 'cp864', 'cp875', 'cp1026', 'cp1140',
- 'utf_32', 'utf_32_be', 'utf_32_le',
- ]
- for encoding in unsupported_ascii_incompatible_encodings:
- self.assertRaises(ET.ParseError, ET.XML, bxml(encoding))
-
- self.assertRaises(ValueError, ET.XML, xml('undefined').encode('ascii'))
- self.assertRaises(LookupError, ET.XML, xml('xxx').encode('ascii'))
-
def test_methods(self):
# Test serialization methods.