From 1999c0a00aec9736a58a235d90c9ef5a6f9cff34 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 3 Mar 2019 19:33:48 +0100 Subject: [2.1.x] Reverted "Fixed relative paths imports per isort 4.3.5." This reverts commit 463fe11bc8b2d068e447c5df677e7a31c2af7e03 due to restore of relative paths sorting from isort < 4.3.5 in isort 4.3.10. Backport of b435f82939edf70674856e0e1cd63973c2e0a1d1 from master --- tests/template_tests/syntax_tests/i18n/test_blocktrans.py | 2 +- tests/template_tests/syntax_tests/i18n/test_trans.py | 2 +- tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py | 2 +- tests/template_tests/syntax_tests/test_exceptions.py | 2 +- tests/template_tests/syntax_tests/test_include.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/template_tests/syntax_tests') diff --git a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py index da4f876063..ac8fc16da8 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 .base import MultipleLocaleActivationTestCase, extended_locale_paths, here from ...utils import setup +from .base import MultipleLocaleActivationTestCase, extended_locale_paths, here 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 e3d8963c7f..ba5021a5d5 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 .base import MultipleLocaleActivationTestCase, extended_locale_paths from ...utils import setup +from .base import MultipleLocaleActivationTestCase, extended_locale_paths 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 c422122ef1..38d929e214 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 .base import MultipleLocaleActivationTestCase from ...utils import setup +from .base import MultipleLocaleActivationTestCase class MultipleLocaleActivationTests(MultipleLocaleActivationTestCase): 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_include.py b/tests/template_tests/syntax_tests/test_include.py index bb250c049d..8587639674 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 .test_basic import basic_templates from ..utils import setup +from .test_basic import basic_templates include_fail_templates = { 'include-fail1': '{% load bad_tag %}{% badtag %}', -- cgit v1.3