Skip to content

[3.9] bpo-34480: fix bug where match variable is used prior to being defined (GH-17643) #32256

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

Merged
ambv merged 6 commits into from
May 16, 2022
Merged

[3.9] bpo-34480: fix bug where match variable is used prior to being defined (GH-17643) #32256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
105835c
Fix bpo-31844
mareksuscak Apr 2, 2022
f94036b
Add tests
mareksuscak Apr 2, 2022
ff38a95
Add comments pointing to the bpo issue and remove whitespace.
ezio-melotti Apr 6, 2022
ece3393
Merge branch '3.9' into fix-issue-34480
mareksuscak Apr 9, 2022
53755e1
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 9, 2022
950fb57
Reword NEWS entry to be more high-level
ambv May 16, 2022
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
1 change: 1 addition & 0 deletions Lib/_markupbase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ def parse_marked_section(self, i, report=1):
match= _msmarkedsectionclose.search(rawdata, i+3)
else:
self.error('unknown status keyword %r in marked section' % rawdata[i+3:j])
match = None
if not match:
return -1
if report:
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_htmlparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,5 +787,27 @@ def test_weird_chars_in_unquoted_attribute_values(self):
('starttag', 'form',
[('action', 'bogus|&#()value')])])

def test_invalid_keyword_error_exception(self):
# bpo-34480: check that subclasses that define an
# error method that raises an exception work
class InvalidMarkupException(Exception):
pass
class MyHTMLParser(html.parser.HTMLParser):
def error(self, message):
raise InvalidMarkupException(message)
parser = MyHTMLParser()
with self.assertRaises(InvalidMarkupException):
parser.feed('<![invalid>')

def test_invalid_keyword_error_pass(self):
# bpo-34480: check that subclasses that define an
# error method that doesn't raise an exception work
class MyHTMLParser(html.parser.HTMLParser):
def error(self, message):
pass
parser = MyHTMLParser()
self.assertEqual(parser.feed('<![invalid>'), None)


if __name__ == "__main__":
unittest.main()
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2022-04-09-11-28-49.bpo-34480.Pw-GJ6.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a bug where :mod:`_markupbase` raised an :exc:`UnboundLocalError`
when an invalid keyword was found in marked section. Patch by Marek
Suscak.