Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9f74e86

Browse files
authored
gh-117187: Fix XML tests for vanilla Expat <2.6.0 (GH-117203)
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 simplifiableIdea by Matěj Cepl* sax|etree: Fix reparse deferral tests for vanilla Expat <2.6.0This *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 parent872e212 commit9f74e86

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

‎Lib/test/test_sax.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,10 +1215,10 @@ def test_expat_incremental_reset(self):
12151215

12161216
self.assertEqual(result.getvalue(),start+b"<doc>text</doc>")
12171217

1218+
@unittest.skipIf(pyexpat.version_info< (2,6,0),
1219+
f'Expat{pyexpat.version_info} does not '
1220+
'support reparse deferral')
12181221
deftest_flush_reparse_deferral_enabled(self):
1219-
ifpyexpat.version_info< (2,6,0):
1220-
self.skipTest(f'Expat{pyexpat.version_info} does not support reparse deferral')
1221-
12221222
result=BytesIO()
12231223
xmlgen=XMLGenerator(result)
12241224
parser=create_parser()
@@ -1251,8 +1251,8 @@ def test_flush_reparse_deferral_disabled(self):
12511251

12521252
ifpyexpat.version_info>= (2,6,0):
12531253
parser._parser.SetReparseDeferralEnabled(False)
1254+
self.assertEqual(result.getvalue(),start)# i.e. no elements started
12541255

1255-
self.assertEqual(result.getvalue(),start)# i.e. no elements started
12561256
self.assertFalse(parser._parser.GetReparseDeferralEnabled())
12571257

12581258
parser.flush()

‎Lib/test/test_xml_etree.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,11 +1707,10 @@ def test_unknown_event(self):
17071707
withself.assertRaises(ValueError):
17081708
ET.XMLPullParser(events=('start','end','bogus'))
17091709

1710+
@unittest.skipIf(pyexpat.version_info< (2,6,0),
1711+
f'Expat{pyexpat.version_info} does not '
1712+
'support reparse deferral')
17101713
deftest_flush_reparse_deferral_enabled(self):
1711-
ifpyexpat.version_info< (2,6,0):
1712-
self.skipTest(f'Expat{pyexpat.version_info} does not '
1713-
'support reparse deferral')
1714-
17151714
parser=ET.XMLPullParser(events=('start','end'))
17161715

17171716
forchunkin ("<doc",">"):
@@ -1743,8 +1742,8 @@ def test_flush_reparse_deferral_disabled(self):
17431742
self.skipTest(f'XMLParser.(Get|Set)ReparseDeferralEnabled '
17441743
'methods not available in C')
17451744
parser._parser._parser.SetReparseDeferralEnabled(False)
1745+
self.assert_event_tags(parser, [])# i.e. no elements started
17461746

1747-
self.assert_event_tags(parser, [])# i.e. no elements started
17481747
ifETispyET:
17491748
self.assertFalse(parser._parser._parser.GetReparseDeferralEnabled())
17501749

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix XML tests for vanilla Expat <2.6.0.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp