diff options
Diffstat (limited to 'tests/template_tests/syntax_tests')
11 files changed, 14 insertions, 15 deletions
diff --git a/tests/template_tests/syntax_tests/test_autoescape.py b/tests/template_tests/syntax_tests/test_autoescape.py index 7b5c12c59c..d58dfc9176 100644 --- a/tests/template_tests/syntax_tests/test_autoescape.py +++ b/tests/template_tests/syntax_tests/test_autoescape.py @@ -2,7 +2,7 @@ from django.template import TemplateSyntaxError from django.test import SimpleTestCase from django.utils.safestring import mark_safe -from ..utils import setup, SafeClass, UnsafeClass +from ..utils import SafeClass, UnsafeClass, setup class AutoescapeTagTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/test_basic.py b/tests/template_tests/syntax_tests/test_basic.py index 073d26e10b..741b3ace8f 100644 --- a/tests/template_tests/syntax_tests/test_basic.py +++ b/tests/template_tests/syntax_tests/test_basic.py @@ -1,8 +1,7 @@ from django.template.base import Context, TemplateSyntaxError from django.test import SimpleTestCase -from ..utils import setup, SilentGetItemClass, SilentAttrClass, SomeClass - +from ..utils import SilentAttrClass, SilentGetItemClass, SomeClass, setup basic_templates = { 'basic-syntax01': 'something cool', diff --git a/tests/template_tests/syntax_tests/test_exceptions.py b/tests/template_tests/syntax_tests/test_exceptions.py index e3645cb13f..db1e0f9f5f 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 .test_extends import inheritance_templates from ..utils import setup +from .test_extends import inheritance_templates class ExceptionsTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/test_extends.py b/tests/template_tests/syntax_tests/test_extends.py index 3ad19616af..1b0ff36a3c 100644 --- a/tests/template_tests/syntax_tests/test_extends.py +++ b/tests/template_tests/syntax_tests/test_extends.py @@ -2,7 +2,6 @@ from django.test import SimpleTestCase from ..utils import setup - inheritance_templates = { 'inheritance01': "1{% block first %}&{% endblock %}3{% block second %}_{% endblock %}", 'inheritance02': "{% extends 'inheritance01' %}" diff --git a/tests/template_tests/syntax_tests/test_filter_syntax.py b/tests/template_tests/syntax_tests/test_filter_syntax.py index 94e7fe2871..1793fc67de 100644 --- a/tests/template_tests/syntax_tests/test_filter_syntax.py +++ b/tests/template_tests/syntax_tests/test_filter_syntax.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.template import TemplateSyntaxError from django.test import SimpleTestCase -from ..utils import setup, SomeClass, SomeOtherException, UTF8Class +from ..utils import SomeClass, SomeOtherException, UTF8Class, setup class FilterSyntaxTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/test_if.py b/tests/template_tests/syntax_tests/test_if.py index 9f207c4114..290a092a04 100644 --- a/tests/template_tests/syntax_tests/test_if.py +++ b/tests/template_tests/syntax_tests/test_if.py @@ -1,11 +1,11 @@ import warnings from django.template import TemplateSyntaxError -from django.test import ignore_warnings, SimpleTestCase +from django.test import SimpleTestCase, ignore_warnings from django.test.utils import reset_warning_registry from django.utils.deprecation import RemovedInDjango20Warning -from ..utils import setup, TestObj +from ..utils import TestObj, setup class IfTagTests(SimpleTestCase): diff --git a/tests/template_tests/syntax_tests/test_include.py b/tests/template_tests/syntax_tests/test_include.py index 7f3adfd8fe..17ad9c1e4c 100644 --- a/tests/template_tests/syntax_tests/test_include.py +++ b/tests/template_tests/syntax_tests/test_include.py @@ -1,9 +1,8 @@ from django.template import Context, TemplateDoesNotExist, TemplateSyntaxError from django.test import SimpleTestCase -from .test_basic import basic_templates from ..utils import setup - +from .test_basic import basic_templates include_fail_templates = { 'include-fail1': '{% load bad_tag %}{% badtag %}', diff --git a/tests/template_tests/syntax_tests/test_numpy.py b/tests/template_tests/syntax_tests/test_numpy.py index dd6c01f976..822b10fd7a 100644 --- a/tests/template_tests/syntax_tests/test_numpy.py +++ b/tests/template_tests/syntax_tests/test_numpy.py @@ -1,5 +1,5 @@ -from unittest import skipIf import warnings +from unittest import skipIf from django.test import SimpleTestCase diff --git a/tests/template_tests/syntax_tests/test_ssi.py b/tests/template_tests/syntax_tests/test_ssi.py index b87c1f9c2c..b000dd6583 100644 --- a/tests/template_tests/syntax_tests/test_ssi.py +++ b/tests/template_tests/syntax_tests/test_ssi.py @@ -1,7 +1,9 @@ import os -from django.test import ignore_warnings, SimpleTestCase -from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning +from django.test import SimpleTestCase, ignore_warnings +from django.utils.deprecation import ( + RemovedInDjango19Warning, RemovedInDjango20Warning, +) from ..utils import ROOT, setup diff --git a/tests/template_tests/syntax_tests/test_static.py b/tests/template_tests/syntax_tests/test_static.py index 19b4e53cde..b646ac2bb8 100644 --- a/tests/template_tests/syntax_tests/test_static.py +++ b/tests/template_tests/syntax_tests/test_static.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.test import override_settings, SimpleTestCase +from django.test import SimpleTestCase, override_settings from django.utils.six.moves.urllib.parse import urljoin from ..utils import setup diff --git a/tests/template_tests/syntax_tests/test_url.py b/tests/template_tests/syntax_tests/test_url.py index 60f777f6d0..8da4dba67b 100644 --- a/tests/template_tests/syntax_tests/test_url.py +++ b/tests/template_tests/syntax_tests/test_url.py @@ -1,7 +1,7 @@ # coding: utf-8 from django.core.urlresolvers import NoReverseMatch from django.template import TemplateSyntaxError -from django.test import ignore_warnings, override_settings, SimpleTestCase +from django.test import SimpleTestCase, ignore_warnings, override_settings from django.utils.deprecation import RemovedInDjango20Warning from ..utils import setup |