diff --git a/compressor/tests/test_jinja2ext.py b/compressor/tests/test_jinja2ext.py index 4dff589..fc334da 100644 --- a/compressor/tests/test_jinja2ext.py +++ b/compressor/tests/test_jinja2ext.py @@ -2,9 +2,10 @@ from __future__ import with_statement, unicode_literals import sys +import unittest from django.test import TestCase -from django.utils import unittest, six +from django.utils import six from django.test.utils import override_settings from compressor.conf import settings diff --git a/compressor/tests/test_offline.py b/compressor/tests/test_offline.py index 6d8f117..5a701ad 100644 --- a/compressor/tests/test_offline.py +++ b/compressor/tests/test_offline.py @@ -2,13 +2,14 @@ from __future__ import with_statement, unicode_literals import io import os import sys +import unittest +from importlib import import_module import django from django.core.management.base import CommandError from django.template import Template, Context from django.test import TestCase -from django.utils import six, unittest -from django.utils.importlib import import_module +from django.utils import six from compressor.cache import flush_offline_manifest, get_offline_manifest from compressor.conf import settings diff --git a/compressor/tests/test_parsers.py b/compressor/tests/test_parsers.py index 362b2c8..9b5a809 100644 --- a/compressor/tests/test_parsers.py +++ b/compressor/tests/test_parsers.py @@ -1,5 +1,6 @@ from __future__ import with_statement import os +import unittest try: import lxml @@ -11,7 +12,6 @@ try: except ImportError: html5lib = None -from django.utils import unittest from django.test.utils import override_settings from compressor.base import SOURCE_HUNK, SOURCE_FILE diff --git a/compressor/tests/test_utils.py b/compressor/tests/test_utils.py index 37c84bb..14651c5 100644 --- a/compressor/tests/test_utils.py +++ b/compressor/tests/test_utils.py @@ -1,4 +1,5 @@ -from django.utils import unittest +import unittest + from django.test import TestCase from django.test.utils import override_settings from django.conf import settings diff --git a/requirements/tests.txt b/requirements/tests.txt index c7f731d..1b088bb 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -5,7 +5,6 @@ mock==1.0.1 Jinja2==2.7.3 lxml==3.4.2 beautifulsoup4==4.4.0 -unittest2==1.0.0 jingo==0.7 django-sekizai==0.9.0 django-overextends==0.4.0 diff --git a/tox.ini b/tox.ini index fe53a56..f3e8e3b 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ two = Jinja2==2.7.3 lxml==3.4.2 beautifulsoup4==4.4.0 - unittest2==1.0.0 jingo==0.7 django-sekizai==0.9.0 django-overextends==0.4.0