Ticket #17730: 17730-alternative.patch

django/test/html.py

@@ -2 +2 @@
 Comparing two html documents.
 """
 import re
-from HTMLParser import HTMLParseError
 from django.utils.encoding import force_unicode
-from django.utils.htmlparser import HTMLParser
+from django.utils.htmlparser import HTMLParser, HTMLParseError
 
 
 WHITESPACE = re.compile('\s+')

django/utils/htmlparser.py

@@ -1 +1 @@
 import HTMLParser as _HTMLParser
 import re
 
+HTMLParseError = _HTMLParser.HTMLParseError
 
 class HTMLParser(_HTMLParser.HTMLParser):
     """