Recorded merge of revisions 81500-81501 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81500 | victor.stinner | 2010-05-24 23:33:24 +0200 (lun., 24 mai 2010) | 2 lines
Issue #6662: Fix parsing of malformatted charref (&#bad;)
........
r81501 | victor.stinner | 2010-05-24 23:37:28 +0200 (lun., 24 mai 2010) | 2 lines
Add the author of the last fix (Issue #6662)
........
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
index 83a5825..c2c7f6b 100644
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -175,6 +175,9 @@
i = self.updatepos(i, k)
continue
else:
+ if ";" in rawdata[i:]: #bail by consuming &#
+ self.handle_data(rawdata[0:2])
+ i = self.updatepos(i, 2)
break
elif startswith('&', i):
match = entityref.match(rawdata, i)
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
index dd74aac..e982218 100644
--- a/Lib/test/test_htmlparser.py
+++ b/Lib/test/test_htmlparser.py
@@ -136,6 +136,13 @@
("data", "\n"),
])
+ def test_malformatted_charref(self):
+ self._run_check("<p>&#bad;</p>", [
+ ("starttag", "p", []),
+ ("data", "&#bad;"),
+ ("endtag", "p"),
+ ])
+
def test_unclosed_entityref(self):
self._run_check("&entityref foo", [
("entityref", "entityref"),
diff --git a/Misc/ACKS b/Misc/ACKS
index b35acaf..ee62542 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -871,3 +871,4 @@
Uwe Zessin
Tarek Ziadé
Peter Åstrand
+Fredrik Håård
diff --git a/Misc/NEWS b/Misc/NEWS
index 36f374b..df36345 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -392,6 +392,9 @@
Library
-------
+- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by
+ Fredrik Håård
+
- Issue #8540: Decimal module: rename the Context._clamp attribute to
Context.clamp and make it public. This is useful in creating
contexts that correspond to the decimal interchange formats