Skip to content

Simplify HTMLParser by removing unnecessary assignment and assertion #132972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Simplify HTMLParser by removing unnecessary assignment and assertion #132972

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1287322
Simplify HTMLParser by removing unnecessary assignment and assertion
muglug Apr 25, 2025
9a2fc81
Merge branch 'main' into htmlparser-simplify
muglug May 22, 2025
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
5 changes: 1 addition & 4 deletions Lib/html/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ def goahead(self, end):
if match:
Copy link
Member

Choose a reason for hiding this comment

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

Are there tests for this branch?
Can you elaborate on when this branch is executed, and possibly add a test that ensures that the position just needs to be updated to i + 1 and not k?

Copy link
Author

Choose a reason for hiding this comment

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

I have no idea what the ideal code should be — this is already an edge-case, that in a previous strict mode caused the parsing to fail.

This un-executed code was added in 2010 — maybe @bitdancer has more context (though I can hardly remember what I did last month, let alone answer for code I wrote 15 years ago).

My general rule in these things is to clear up code so it matches what executes in production, and remove things that might trip up someone debugging the code into thinking the code did something.

Copy link
Member

Choose a reason for hiding this comment

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

No surprise, I have no memory of this. Looking at the original diff I don't see that that if on k was doing anything, and certainly in the current code it isn't doing anything. k doesn't have a meaningful value at that point, and isn't used.

# match.group() will contain at least 2 chars
if end and match.group() == rawdata[i:]:
k = match.end()
if k <= i:
k = n
i = self.updatepos(i, i + 1)
# incomplete
break
Expand All @@ -243,7 +240,7 @@ def goahead(self, end):
assert 0, "interesting.search() lied"
# end while
if end and i < n and not self.cdata_elem:
if self.convert_charrefs and not self.cdata_elem:
if self.convert_charrefs:
self.handle_data(unescape(rawdata[i:n]))
else:
self.handle_data(rawdata[i:n])
Expand Down
Loading