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
6 changes: 6 additions & 0 deletions Doc/library/html.parser.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ The output will then be:
:meth:`close` is called. *data* must be :class:`str`.


.. method:: HTMLParser.flush()

Process all data fed insofar as it consists of complete elements. Incomplete
data remains buffered.


.. method:: HTMLParser.close()

Force processing of all buffered data as if it were followed by an end-of-file
Expand Down
11 changes: 11 additions & 0 deletions Lib/html/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,17 @@ def feed(self, data):
# Nothing was parsed; wait until the buffer doubles.
self._parse_threshold = len(self.rawdata)

def flush(self):
"""Process all data fed insofar as it consists of complete elements.
Incomplete data remains buffered.
"""
if self._pending:
self.rawdata += ''.join(self._pending)
self._pending.clear()
self._pending_len = 0
self._parse_threshold = 1
self.goahead(0)

def close(self):
"""Handle any buffered data."""
if self._pending:
Expand Down
20 changes: 20 additions & 0 deletions Lib/test/test_htmlparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def get_events(self):
else:
L.append(event)
prevtype = type
# Reset events and append for re-testing
self.events = L
self.append = self.events.append
return L

# structure markup
Expand Down Expand Up @@ -1021,6 +1023,24 @@ def test_convert_charrefs_dropped_text(self):
('endtag', 'a'), ('data', ' bar & baz')]
)

def test_flush(self):
attrs = [(f"a{i}", str(i)) for i in range(8)]
parts = ["<div", *[f' {attr[0]}="{attr[1]}"' for attr in attrs], ">", "</div>"]
parser = EventCollector()
for part in parts:
parser.feed(part)
# confirm the fed data is buffered and not processed yet
self.assertEqual(parser.get_events(), [])
parser.flush()
expected = [
('starttag', 'div', attrs),
('endtag', 'div'),
]
self.assertEqual(parser.get_events(), expected)
parser.close()
# close should do nothing, event log is the same as before
self.assertEqual(parser.get_events(), expected)

@support.requires_resource('cpu')
def test_eof_no_quadratic_complexity(self):
# Each of these examples used to take about an hour.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Add ``HTMLParser.flush()`` to process all buffered data that consists of
complete elements. This method will be useful now that
``HTMLParser.feed()`` utilizes more extensive buffering.
Loading