summaryrefslogtreecommitdiff
path: root/django/test/runner.py
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 /django/test/runner.py
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'django/test/runner.py')
-rw-r--r--django/test/runner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/test/runner.py b/django/test/runner.py
index e753e365fa..709b685de5 100644
--- a/django/test/runner.py
+++ b/django/test/runner.py
@@ -1,12 +1,12 @@
import os
from optparse import make_option
+import unittest
+from unittest import TestSuite, defaultTestLoader
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
from django.test.utils import setup_test_environment, teardown_test_environment
-from django.utils import unittest
-from django.utils.unittest import TestSuite, defaultTestLoader
class DiscoverRunner(object):