diff options
| -rw-r--r-- | Lib/html/parser.py | 17 | ||||
| -rw-r--r-- | Lib/test/test_htmlparser.py | 5 |
2 files changed, 15 insertions, 7 deletions
diff --git a/Lib/html/parser.py b/Lib/html/parser.py index 8d275ab..21ebbc3 100644 --- a/Lib/html/parser.py +++ b/Lib/html/parser.py @@ -434,13 +434,16 @@ class HTMLParser(_markupbase.ParserBase): return s def replaceEntities(s): s = s.groups()[0] - if s[0] == "#": - s = s[1:] - if s[0] in ['x','X']: - c = int(s[1:], 16) - else: - c = int(s) - return chr(c) + try: + if s[0] == "#": + s = s[1:] + if s[0] in ['x','X']: + c = int(s[1:], 16) + else: + c = int(s) + return chr(c) + except ValueError: + return '&#'+ s +';' else: # Cannot use name2codepoint directly, because HTMLParser # supports apos, which is not part of HTML 4 diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py index beaf6b6..5ecd016 100644 --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -356,6 +356,11 @@ class HTMLParserTolerantTestCase(TestCaseBase): [('action', 'bogus|&#()value')])], collector = self.collector) + def test_unescape_function(self): + p = html.parser.HTMLParser() + self.assertEqual(p.unescape('&#bad;'),'&#bad;') + self.assertEqual(p.unescape('&'),'&') + def test_main(): support.run_unittest(HTMLParserTestCase, HTMLParserTolerantTestCase) |