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
12 changes: 8 additions & 4 deletions Lib/test/test_pulldom.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,13 @@ def test_expandItem(self):
next(items) # Skip character data
evt, node = next(items)
self.assertEqual(node.tagName, "html")
with self.assertRaises(StopIteration):
next(items)
# Consume any remaining events (e.g. END_ELEMENT, END_DOCUMENT)
# that are now correctly delivered after the fix for parser.close()
remaining = list(items)
self.assertTrue(
any(evt == pulldom.END_DOCUMENT for evt, _ in remaining),
"Expected END_DOCUMENT in remaining events"
)
items.clear()
self.assertIsNone(items.parser)
self.assertIsNone(items.stream)
Expand All @@ -144,9 +149,8 @@ def test_comment(self):
else:
self.fail("No comment was encountered")

@unittest.expectedFailure
def test_end_document(self):
"""PullDOM does not receive "end-document" events."""
"""PullDOM receives end-document events."""
items = pulldom.parseString(SMALL_SAMPLE)
# Read all of the nodes up to and including </html>:
for evt, node in items:
Expand Down
2 changes: 2 additions & 0 deletions Lib/xml/dom/pulldom.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ def getEvent(self):
buf = self.stream.read(self.bufsize)
if not buf:
self.parser.close()
if self.pulldom.firstEvent[1]:
break
return None
self.parser.feed(buf)
rc = self.pulldom.firstEvent[1][0]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix :class:`xml.dom.pulldom.DOMEventStream` silently dropping SAX events
produced by ``parser.close()`` at end-of-stream. When ``bufsize`` caused the
final tag to be split across reads, ``END_ELEMENT`` and other trailing events
were lost.
Loading