--- python-django-1.4.1.orig/django/test/html.py +++ python-django-1.4.1/django/test/html.py @@ -4,7 +4,15 @@ Comparing two html documents. import re from HTMLParser import HTMLParseError from django.utils.encoding import force_unicode -from django.utils.html_parser import HTMLParser + +import sys +current_version = sys.version_info +if current_version >= (2, 7, 3) and current_version.releaselevel == 'final': + from HTMLParser import HTMLParser +elif current_version < (2, 7) and current_version >= (2, 6, 8): + from HTMLParser import HTMLParser +else: + from django.utils.html_parser import HTMLParser WHITESPACE = re.compile('\s+')