summaryrefslogtreecommitdiff
path: root/tests/template_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/template_tests')
-rw-r--r--tests/template_tests/filter_tests/test_date.py2
-rw-r--r--tests/template_tests/filter_tests/test_time.py2
-rw-r--r--tests/template_tests/filter_tests/test_timesince.py2
-rw-r--r--tests/template_tests/filter_tests/test_timeuntil.py2
-rw-r--r--tests/template_tests/syntax_tests/i18n/test_blocktrans.py2
-rw-r--r--tests/template_tests/syntax_tests/i18n/test_trans.py2
-rw-r--r--tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py2
-rw-r--r--tests/template_tests/syntax_tests/test_exceptions.py2
-rw-r--r--tests/template_tests/syntax_tests/test_include.py2
9 files changed, 9 insertions, 9 deletions
diff --git a/tests/template_tests/filter_tests/test_date.py b/tests/template_tests/filter_tests/test_date.py
index f973c229b9..2163984ab3 100644
--- a/tests/template_tests/filter_tests/test_date.py
+++ b/tests/template_tests/filter_tests/test_date.py
@@ -4,8 +4,8 @@ from django.template.defaultfilters import date
from django.test import SimpleTestCase, override_settings
from django.utils import timezone, translation
-from ..utils import setup
from .timezone_utils import TimezoneTestCase
+from ..utils import setup
class DateTests(TimezoneTestCase):
diff --git a/tests/template_tests/filter_tests/test_time.py b/tests/template_tests/filter_tests/test_time.py
index 919417dc12..f9a9b26f34 100644
--- a/tests/template_tests/filter_tests/test_time.py
+++ b/tests/template_tests/filter_tests/test_time.py
@@ -4,8 +4,8 @@ from django.template.defaultfilters import time as time_filter
from django.test import SimpleTestCase, override_settings
from django.utils import timezone, translation
-from ..utils import setup
from .timezone_utils import TimezoneTestCase
+from ..utils import setup
class TimeTests(TimezoneTestCase):
diff --git a/tests/template_tests/filter_tests/test_timesince.py b/tests/template_tests/filter_tests/test_timesince.py
index 7fe4831d61..d2fed6720c 100644
--- a/tests/template_tests/filter_tests/test_timesince.py
+++ b/tests/template_tests/filter_tests/test_timesince.py
@@ -4,8 +4,8 @@ from django.template.defaultfilters import timesince_filter
from django.test import SimpleTestCase
from django.test.utils import requires_tz_support
-from ..utils import setup
from .timezone_utils import TimezoneTestCase
+from ..utils import setup
class TimesinceTests(TimezoneTestCase):
diff --git a/tests/template_tests/filter_tests/test_timeuntil.py b/tests/template_tests/filter_tests/test_timeuntil.py
index f3a211c626..0054cda235 100644
--- a/tests/template_tests/filter_tests/test_timeuntil.py
+++ b/tests/template_tests/filter_tests/test_timeuntil.py
@@ -4,8 +4,8 @@ from django.template.defaultfilters import timeuntil_filter
from django.test import SimpleTestCase
from django.test.utils import requires_tz_support
-from ..utils import setup
from .timezone_utils import TimezoneTestCase
+from ..utils import setup
class TimeuntilTests(TimezoneTestCase):
diff --git a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py
index ac8fc16da8..da4f876063 100644
--- a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py
+++ b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py
@@ -7,8 +7,8 @@ from django.utils import translation
from django.utils.safestring import mark_safe
from django.utils.translation import trans_real
-from ...utils import setup
from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here
+from ...utils import setup
class I18nBlockTransTagTests(SimpleTestCase):
diff --git a/tests/template_tests/syntax_tests/i18n/test_trans.py b/tests/template_tests/syntax_tests/i18n/test_trans.py
index ba5021a5d5..e3d8963c7f 100644
--- a/tests/template_tests/syntax_tests/i18n/test_trans.py
+++ b/tests/template_tests/syntax_tests/i18n/test_trans.py
@@ -7,8 +7,8 @@ from django.utils import translation
from django.utils.safestring import mark_safe
from django.utils.translation import trans_real
-from ...utils import setup
from .base import MultipleLocaleActivationTestCase, extended_locale_paths
+from ...utils import setup
class I18nTransTagTests(SimpleTestCase):
diff --git a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py
index 38d929e214..c422122ef1 100644
--- a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py
+++ b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py
@@ -2,8 +2,8 @@ from django.template import Context, Template
from django.test import SimpleTestCase
from django.utils import translation
-from ...utils import setup
from .base import MultipleLocaleActivationTestCase
+from ...utils import setup
class MultipleLocaleActivationTests(MultipleLocaleActivationTestCase):
diff --git a/tests/template_tests/syntax_tests/test_exceptions.py b/tests/template_tests/syntax_tests/test_exceptions.py
index db1e0f9f5f..e3645cb13f 100644
--- a/tests/template_tests/syntax_tests/test_exceptions.py
+++ b/tests/template_tests/syntax_tests/test_exceptions.py
@@ -1,8 +1,8 @@
from django.template import TemplateDoesNotExist, TemplateSyntaxError
from django.test import SimpleTestCase
-from ..utils import setup
from .test_extends import inheritance_templates
+from ..utils import setup
class ExceptionsTests(SimpleTestCase):
diff --git a/tests/template_tests/syntax_tests/test_include.py b/tests/template_tests/syntax_tests/test_include.py
index 8587639674..bb250c049d 100644
--- a/tests/template_tests/syntax_tests/test_include.py
+++ b/tests/template_tests/syntax_tests/test_include.py
@@ -3,8 +3,8 @@ from django.template import (
)
from django.test import SimpleTestCase
-from ..utils import setup
from .test_basic import basic_templates
+from ..utils import setup
include_fail_templates = {
'include-fail1': '{% load bad_tag %}{% badtag %}',