summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 14:22:27 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-07-01 14:29:33 +0200
commitcfcf4b3605f9653e4e056088d89932b2a0e4281b (patch)
tree1eed1ebdb087b26abeddf5245fc723930d14d847 /tests/admin_scripts
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 2b772598d3..28f2dcb841 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -6,13 +6,14 @@ and default settings.py files.
"""
from __future__ import unicode_literals
+import codecs
import os
import re
import shutil
import socket
import subprocess
import sys
-import codecs
+import unittest
import django
from django import conf, get_version
@@ -20,7 +21,6 @@ from django.conf import settings
from django.core.management import BaseCommand, CommandError
from django.db import connection
from django.test.runner import DiscoverRunner
-from django.utils import unittest
from django.utils.encoding import force_text
from django.utils._os import upath
from django.utils.six import StringIO