Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Lib/test/test_pyexpat.py
Original file line number Diff line number Diff line change
Expand Up @@ -1095,9 +1095,11 @@ def test_error_path_no_crash(self):


class ReparseDeferralTest(unittest.TestCase):
deferal_supported = expat.ParserCreate().GetReparseDeferralEnabled()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please protect this call just in case (put it at the top-level of the file, see ssl tests for instance)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have a look. Not sure what you mean by protect, but hopefully that will be more obvious when I do.


def test_getter_setter_round_trip(self):
parser = expat.ParserCreate()
enabled = (expat.version_info >= (2, 6, 0))
enabled = self.deferal_supported

self.assertIs(parser.GetReparseDeferralEnabled(), enabled)
parser.SetReparseDeferralEnabled(False)
Expand All @@ -1106,8 +1108,8 @@ def test_getter_setter_round_trip(self):
self.assertIs(parser.GetReparseDeferralEnabled(), enabled)

def test_reparse_deferral_enabled(self):
if expat.version_info < (2, 6, 0):
self.skipTest(f'Expat {expat.version_info} does not '
if not self.deferal_supported:
self.skipTest(f'Expat < 2.6.0 does not '
'support reparse deferral')

started = []
Expand Down Expand Up @@ -1137,7 +1139,7 @@ def start_element(name, _):

parser = expat.ParserCreate()
parser.StartElementHandler = start_element
if expat.version_info >= (2, 6, 0):
if self.deferal_supported:
parser.SetReparseDeferralEnabled(False)
self.assertFalse(parser.GetReparseDeferralEnabled())

Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_sax.py
Original file line number Diff line number Diff line change
Expand Up @@ -1216,8 +1216,8 @@ def test_expat_incremental_reset(self):

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

@unittest.skipIf(pyexpat.version_info < (2, 6, 0),
f'Expat {pyexpat.version_info} does not '
@unittest.skipIf(not pyexpat.ParserCreate().GetReparseDeferralEnabled(),
'Python compiled with Expat < 2.6.0 does not '
'support reparse deferral')
def test_flush_reparse_deferral_enabled(self):
result = BytesIO()
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_xml_etree.py
Original file line number Diff line number Diff line change
Expand Up @@ -1915,8 +1915,8 @@ def test_unknown_event(self):
with self.assertRaisesRegex(ValueError, "unknown event 'bogus'"):
ET.XMLPullParser(events=(x.decode() for x in (b'start', b'end', b'bogus')))

@unittest.skipIf(pyexpat.version_info < (2, 6, 0),
f'Expat {pyexpat.version_info} does not '
@unittest.skipIf(not pyexpat.ParserCreate().GetReparseDeferralEnabled(),
'Python compiled with Expat < 2.6.0 does not '
'support reparse deferral')
def test_flush_reparse_deferral_enabled(self):
parser = ET.XMLPullParser(events=('start', 'end'))
Expand Down
Loading