Repository navigation
Commit 9f74e86
authored
This fixes XML unittest fallout from the #115398 security fix. When configured using `--with-system-expat` on systems with older pre 2.6.0 versions of libexpat, our unittests were failing.
* sax|etree: Simplify Expat version guard where simplifiable
Idea by Matěj Cepl
* sax|etree: Fix reparse deferral tests for vanilla Expat <2.6.0
This *does not fix* the case of distros with an older version of libexpat with the 2.6.0 feature backported as a security fix. (Ubuntu is a known example of this with its libexpat1 2.5.0-2ubunutu0.1 package)
1 parent 872e212 commit 9f74e86
3 files changed
Lines changed: 9 additions & 9 deletions
File tree
- Lib/test
- Misc/NEWS.d/next/Tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1215,10 +1215,10 @@ def test_expat_incremental_reset(self): | |||
| 1215 | 1215 | ||
| 1216 | 1216 | self.assertEqual(result.getvalue(), start + b"<doc>text</doc>") | |
| 1217 | 1217 | ||
| 1218 | + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), | ||
| 1219 | + f'Expat {pyexpat.version_info} does not ' | ||
| 1220 | + 'support reparse deferral') | ||
| 1218 | 1221 | def test_flush_reparse_deferral_enabled(self): | |
| 1219 | - if pyexpat.version_info < (2, 6, 0): | ||
| 1220 | - self.skipTest(f'Expat {pyexpat.version_info} does not support reparse deferral') | ||
| 1221 | - | ||
| 1222 | 1222 | result = BytesIO() | |
| 1223 | 1223 | xmlgen = XMLGenerator(result) | |
| 1224 | 1224 | parser = create_parser() | |
@@ -1251,8 +1251,8 @@ def test_flush_reparse_deferral_disabled(self): | |||
| 1251 | 1251 | ||
| 1252 | 1252 | if pyexpat.version_info >= (2, 6, 0): | |
| 1253 | 1253 | parser._parser.SetReparseDeferralEnabled(False) | |
| 1254 | + self.assertEqual(result.getvalue(), start) # i.e. no elements started | ||
| 1254 | 1255 | ||
| 1255 | - self.assertEqual(result.getvalue(), start) # i.e. no elements started | ||
| 1256 | 1256 | self.assertFalse(parser._parser.GetReparseDeferralEnabled()) | |
| 1257 | 1257 | ||
| 1258 | 1258 | parser.flush() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1707,11 +1707,10 @@ def test_unknown_event(self): | |||
| 1707 | 1707 | with self.assertRaises(ValueError): | |
| 1708 | 1708 | ET.XMLPullParser(events=('start', 'end', 'bogus')) | |
| 1709 | 1709 | ||
| 1710 | + @unittest.skipIf(pyexpat.version_info < (2, 6, 0), | ||
| 1711 | + f'Expat {pyexpat.version_info} does not ' | ||
| 1712 | + 'support reparse deferral') | ||
| 1710 | 1713 | def test_flush_reparse_deferral_enabled(self): | |
| 1711 | - if pyexpat.version_info < (2, 6, 0): | ||
| 1712 | - self.skipTest(f'Expat {pyexpat.version_info} does not ' | ||
| 1713 | - 'support reparse deferral') | ||
| 1714 | - | ||
| 1715 | 1714 | parser = ET.XMLPullParser(events=('start', 'end')) | |
| 1716 | 1715 | ||
| 1717 | 1716 | for chunk in ("<doc", ">"): | |
@@ -1743,8 +1742,8 @@ def test_flush_reparse_deferral_disabled(self): | |||
| 1743 | 1742 | self.skipTest(f'XMLParser.(Get|Set)ReparseDeferralEnabled ' | |
| 1744 | 1743 | 'methods not available in C') | |
| 1745 | 1744 | parser._parser._parser.SetReparseDeferralEnabled(False) | |
| 1745 | + self.assert_event_tags(parser, []) # i.e. no elements started | ||
| 1746 | 1746 | ||
| 1747 | - self.assert_event_tags(parser, []) # i.e. no elements started | ||
| 1748 | 1747 | if ET is pyET: | |
| 1749 | 1748 | self.assertFalse(parser._parser._parser.GetReparseDeferralEnabled()) | |
| 1750 | 1749 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + Fix XML tests for vanilla Expat <2.6.0. | ||
0 commit comments