summaryrefslogtreecommitdiff
path: root/tests/template_tests/loaders.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 /tests/template_tests/loaders.py
parent7f264e02f4480c49d1440be882416a10951c2165 (diff)
Stopped using django.utils.unittest in the test suite.
Refs #20680.
Diffstat (limited to 'tests/template_tests/loaders.py')
-rw-r--r--tests/template_tests/loaders.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/template_tests/loaders.py b/tests/template_tests/loaders.py
index b77965203f..497b422e7f 100644
--- a/tests/template_tests/loaders.py
+++ b/tests/template_tests/loaders.py
@@ -9,15 +9,16 @@ from django.conf import settings
if __name__ == '__main__':
settings.configure()
-import sys
-import pkg_resources
import imp
import os.path
+import pkg_resources
+import sys
+import unittest
from django.template import TemplateDoesNotExist, Context
from django.template.loaders.eggs import Loader as EggLoader
from django.template import loader
-from django.utils import unittest, six
+from django.utils import six
from django.utils._os import upath
from django.utils.six import StringIO