diff options
Diffstat (limited to 'django/test')
| -rw-r--r-- | django/test/_doctest.py | 2 | ||||
| -rw-r--r-- | django/test/html.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/django/test/_doctest.py b/django/test/_doctest.py index 75f16e202a..316c785f33 100644 --- a/django/test/_doctest.py +++ b/django/test/_doctest.py @@ -103,9 +103,9 @@ import __future__ import sys, traceback, inspect, linecache, os, re import unittest, difflib, pdb, tempfile import warnings -from StringIO import StringIO from django.utils import six +from django.utils.six import StringIO if sys.platform.startswith('java'): # On Jython, isclass() reports some modules as classes. Patch it. diff --git a/django/test/html.py b/django/test/html.py index 8d577d91fd..2a1421bf17 100644 --- a/django/test/html.py +++ b/django/test/html.py @@ -5,9 +5,8 @@ Comparing two html documents. from __future__ import unicode_literals import re -from HTMLParser import HTMLParseError from django.utils.encoding import force_unicode -from django.utils.html_parser import HTMLParser +from django.utils.html_parser import HTMLParser, HTMLParseError from django.utils import six |