|
|
5d803b |
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
|
|
|
5d803b |
index 06c9107..6c3f5a8 100644
|
|
|
5d803b |
--- a/Lib/test/test_minidom.py
|
|
|
5d803b |
+++ b/Lib/test/test_minidom.py
|
|
|
5d803b |
@@ -1149,14 +1149,11 @@ class MinidomTest(unittest.TestCase):
|
|
|
5d803b |
|
|
|
5d803b |
# Verify that character decoding errors raise exceptions instead
|
|
|
5d803b |
# of crashing
|
|
|
5d803b |
- if pyexpat.version_info >= (2, 4, 5):
|
|
|
5d803b |
- self.assertRaises(ExpatError, parseString,
|
|
|
5d803b |
- b'<fran\xe7ais></fran\xe7ais>')
|
|
|
5d803b |
- self.assertRaises(ExpatError, parseString,
|
|
|
5d803b |
- b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
|
|
|
5d803b |
- else:
|
|
|
5d803b |
- self.assertRaises(UnicodeDecodeError, parseString,
|
|
|
5d803b |
- b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>')
|
|
|
5d803b |
+
|
|
|
5d803b |
+ self.assertRaises(ExpatError, parseString,
|
|
|
5d803b |
+ b'<fran\xe7ais></fran\xe7ais>')
|
|
|
5d803b |
+ self.assertRaises(ExpatError, parseString,
|
|
|
5d803b |
+ b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
|
|
|
5d803b |
|
|
|
5d803b |
doc.unlink()
|
|
|
5d803b |
|
|
|
5d803b |
@@ -1601,10 +1598,7 @@ class MinidomTest(unittest.TestCase):
|
|
|
5d803b |
self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
|
|
|
5d803b |
|
|
|
5d803b |
def testExceptionOnSpacesInXMLNSValue(self):
|
|
|
5d803b |
- if pyexpat.version_info >= (2, 4, 5):
|
|
|
5d803b |
- context = self.assertRaisesRegex(ExpatError, 'syntax error')
|
|
|
5d803b |
- else:
|
|
|
5d803b |
- context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
|
|
|
5d803b |
+ context = self.assertRaisesRegex(ExpatError, 'syntax error')
|
|
|
5d803b |
|
|
|
5d803b |
with context:
|
|
|
5d803b |
parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
|