Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
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
5 changes: 5 additions & 0 deletions 5 Doc/whatsnew/3.9.rst
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,11 @@ Removed
:func:`asyncio.current_task` and :func:`asyncio.all_tasks` instead.
(Contributed by Rémi Lapeyre in :issue:`40967`)

* The ``ParserBase.error()`` method from the private and undocumented ``_markupbase``
module has been removed. :class:`html.parser.HTMLParser` is the only subclass of
``ParserBase`` and its ``error()`` implementation has already been removed in
Python 3.5.
(Contributed by Berker Peksag in :issue:`31844`.)

Porting to Python 3.9
=====================
Expand Down
35 changes: 18 additions & 17 deletions 35 Lib/_markupbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ def __init__(self):
raise RuntimeError(
"_markupbase.ParserBase must be subclassed")

def error(self, message):
raise NotImplementedError(
"subclasses of ParserBase must override error()")

def reset(self):
self.lineno = 1
self.offset = 0
Expand Down Expand Up @@ -131,12 +127,11 @@ def parse_declaration(self, i):
# also in data attribute specifications of attlist declaration
# also link type declaration subsets in linktype declarations
# also link attribute specification lists in link declarations
self.error("unsupported '[' char in %s declaration" % decltype)
raise AssertionError("unsupported '[' char in %s declaration" % decltype)
else:
self.error("unexpected '[' char in declaration")
raise AssertionError("unexpected '[' char in declaration")
else:
self.error(
"unexpected %r char in declaration" % rawdata[j])
raise AssertionError("unexpected %r char in declaration" % rawdata[j])
if j < 0:
return j
return -1 # incomplete
Expand All @@ -156,7 +151,9 @@ def parse_marked_section(self, i, report=1):
# look for MS Office ]> ending
match= _msmarkedsectionclose.search(rawdata, i+3)
else:
self.error('unknown status keyword %r in marked section' % rawdata[i+3:j])
raise AssertionError(
'unknown status keyword %r in marked section' % rawdata[i+3:j]
)
if not match:
return -1
if report:
Expand All @@ -168,7 +165,7 @@ def parse_marked_section(self, i, report=1):
def parse_comment(self, i, report=1):
rawdata = self.rawdata
if rawdata[i:i+4] != '<!--':
self.error('unexpected call to parse_comment()')
raise AssertionError('unexpected call to parse_comment()')
match = _commentclose.search(rawdata, i+4)
if not match:
return -1
Expand All @@ -192,7 +189,9 @@ def _parse_doctype_subset(self, i, declstartpos):
return -1
if s != "<!":
self.updatepos(declstartpos, j + 1)
self.error("unexpected char in internal subset (in %r)" % s)
raise AssertionError(
"unexpected char in internal subset (in %r)" % s
)
if (j + 2) == n:
# end of buffer; incomplete
return -1
Expand All @@ -209,8 +208,9 @@ def _parse_doctype_subset(self, i, declstartpos):
return -1
if name not in {"attlist", "element", "entity", "notation"}:
self.updatepos(declstartpos, j + 2)
self.error(
"unknown declaration %r in internal subset" % name)
raise AssertionError(
"unknown declaration %r in internal subset" % name
)
# handle the individual names
meth = getattr(self, "_parse_doctype_" + name)
j = meth(j, declstartpos)
Expand All @@ -234,14 +234,14 @@ def _parse_doctype_subset(self, i, declstartpos):
if rawdata[j] == ">":
return j
self.updatepos(declstartpos, j)
self.error("unexpected char after internal subset")
raise AssertionError("unexpected char after internal subset")
else:
return -1
elif c.isspace():
j = j + 1
else:
self.updatepos(declstartpos, j)
self.error("unexpected char %r in internal subset" % c)
raise AssertionError("unexpected char %r in internal subset" % c)
# end of buffer reached
return -1

Expand Down Expand Up @@ -387,8 +387,9 @@ def _scan_name(self, i, declstartpos):
return name.lower(), m.end()
else:
self.updatepos(declstartpos, i)
self.error("expected name token at %r"
% rawdata[declstartpos:declstartpos+20])
raise AssertionError(
"expected name token at %r" % rawdata[declstartpos:declstartpos+20]
)

# To be overridden -- handlers for unknown objects
def unknown_decl(self, data):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Remove ``ParserBase.error()`` method from the private and undocumented
``_markupbase`` module. :class:`html.parser.HTMLParser` is the only
subclass of ``ParserBase`` and its ``error()`` implementation was deprecated
in Python 3.4 and removed in Python 3.5.
Morty Proxy This is a proxified and sanitized view of the page, visit original site.