(original) (raw)

changeset: 77630:8dd2f5754b2f user: Ezio Melotti ezio.melotti@gmail.com date: Sat Jun 23 15:27:51 2012 +0200 files: Doc/library/html.parser.rst Lib/html/parser.py Lib/test/test_htmlparser.py Misc/NEWS description: #15114: the strict mode of HTMLParser and the HTMLParseError exception are deprecated now that the parser is able to parse invalid markup. diff -r 9945d7dfa72c -r 8dd2f5754b2f Doc/library/html.parser.rst --- a/Doc/library/html.parser.rst Sat Jun 23 14:45:21 2012 +0200 +++ b/Doc/library/html.parser.rst Sat Jun 23 15:27:51 2012 +0200 @@ -16,13 +16,14 @@ This module defines a class :class:`HTMLParser` which serves as the basis for parsing text files formatted in HTML (HyperText Mark-up Language) and XHTML. -.. class:: HTMLParser(strict=True) +.. class:: HTMLParser(strict=False) - Create a parser instance. If *strict* is ``True`` (the default), invalid - HTML results in :exc:`~html.parser.HTMLParseError` exceptions [#]_. If - *strict* is ``False``, the parser uses heuristics to make a best guess at - the intention of any invalid HTML it encounters, similar to the way most - browsers do. Using ``strict=False`` is advised. + Create a parser instance. If *strict* is ``False`` (the default), the parser + will accept and parse invalid markup. If *strict* is ``True`` the parser + will raise an :exc:`~html.parser.HTMLParseError` exception instead [#]_ when + it's not able to parse the markup. + The use of ``strict=True`` is discouraged and the *strict* argument is + deprecated. An :class:`.HTMLParser` instance is fed HTML data and calls handler methods when start tags, end tags, text, comments, and other markup elements are @@ -34,6 +35,10 @@ .. versionchanged:: 3.2 *strict* keyword added + .. deprecated-removed:: 3.3 3.5 + The *strict* argument and the strict mode have been deprecated. + The parser is now able to accept and parse invalid markup too. + An exception is defined as well: @@ -46,6 +51,10 @@ detected, and :attr:`offset` is the number of characters into the line at which the construct starts. + .. deprecated-removed:: 3.3 3.5 + This exception has been deprecated because it's never raised by the parser + (when the default non-strict mode is used). + Example HTML Parser Application ------------------------------- diff -r 9945d7dfa72c -r 8dd2f5754b2f Lib/html/parser.py --- a/Lib/html/parser.py Sat Jun 23 14:45:21 2012 +0200 +++ b/Lib/html/parser.py Sat Jun 23 15:27:51 2012 +0200 @@ -10,6 +10,7 @@ import _markupbase import re +import warnings # Regular expressions used for parsing @@ -113,14 +114,16 @@ CDATA_CONTENT_ELEMENTS = ("script", "style") - def __init__(self, strict=True): + def __init__(self, strict=False): """Initialize and reset this instance. - If strict is set to True (the default), errors are raised when invalid - HTML is encountered. If set to False, an attempt is instead made to - continue parsing, making "best guesses" about the intended meaning, in - a fashion similar to what browsers typically do. + If strict is set to False (the default) the parser will parse invalid + markup, otherwise it will raise an error. Note that the strict mode + is deprecated. """ + if strict: + warnings.warn("The strict mode is deprecated.", + DeprecationWarning, stacklevel=2) self.strict = strict self.reset() @@ -271,8 +274,8 @@ # See also parse_declaration in _markupbase def parse_html_declaration(self, i): rawdata = self.rawdata - if rawdata[i:i+2] != '', i+2) if pos == -1: return -1 diff -r 9945d7dfa72c -r 8dd2f5754b2f Lib/test/test_htmlparser.py --- a/Lib/test/test_htmlparser.py Sat Jun 23 14:45:21 2012 +0200 +++ b/Lib/test/test_htmlparser.py Sat Jun 23 15:27:51 2012 +0200 @@ -102,7 +102,8 @@ class HTMLParserStrictTestCase(TestCaseBase): def get_collector(self): - return EventCollector(strict=True) + with support.check_warnings(("", DeprecationWarning), quite=False): + return EventCollector(strict=True) def test_processing_instruction_only(self): self._run_check("", [ @@ -594,7 +595,8 @@ class AttributesStrictTestCase(TestCaseBase): def get_collector(self): - return EventCollector(strict=True) + with support.check_warnings(("", DeprecationWarning), quite=False): + return EventCollector(strict=True) def test_attr_syntax(self): output = [ diff -r 9945d7dfa72c -r 8dd2f5754b2f Misc/NEWS --- a/Misc/NEWS Sat Jun 23 14:45:21 2012 +0200 +++ b/Misc/NEWS Sat Jun 23 15:27:51 2012 +0200 @@ -43,6 +43,9 @@ Library ------- +- Issue #15114: the strict mode of HTMLParser and the HTMLParseError exception + are deprecated now that the parser is able to parse invalid markup. + - Issue #3665: \u and \U escapes are now supported in unicode regular expressions. Patch by Serhiy Storchaka. @@ -78,7 +81,7 @@ - Issue #9527: datetime.astimezone() method will now supply a class timezone instance corresponding to the system local timezone when called with no arguments. - + - Issue #14653: email.utils.mktime_tz() no longer relies on system mktime() when timezone offest is supplied. /ezio.melotti@gmail.com