summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-04-10 10:22:24 -0700
committerDavid Lord <davidism@gmail.com>2021-04-10 10:22:24 -0700
commitaafe94d97a75ffd82f8d38c0a9b5d7e6d250e3e7 (patch)
treeedc0f1c09e0e1f2e287d3e983de567c41a6f5414 /tests
parent39846a887b105497bd5aabc02f40a1e89f422c1f (diff)
downloadjinja2-aafe94d97a75ffd82f8d38c0a9b5d7e6d250e3e7.tar.gz
Markup and escape should be imported from markupsafe
Diffstat (limited to 'tests')
-rw-r--r--tests/test_asyncfilters.py2
-rw-r--r--tests/test_filters.py2
-rw-r--r--tests/test_regression.py2
-rw-r--r--tests/test_security.py2
-rw-r--r--tests/test_tests.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_asyncfilters.py b/tests/test_asyncfilters.py
index b6025ac..f5fcbf2 100644
--- a/tests/test_asyncfilters.py
+++ b/tests/test_asyncfilters.py
@@ -1,10 +1,10 @@
from collections import namedtuple
import pytest
+from markupsafe import Markup
from jinja2 import Environment
from jinja2.asyncsupport import auto_aiter
-from jinja2.utils import Markup
async def make_aiter(iter):
diff --git a/tests/test_filters.py b/tests/test_filters.py
index 0843246..2195157 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -2,9 +2,9 @@ import random
from collections import namedtuple
import pytest
+from markupsafe import Markup
from jinja2 import Environment
-from jinja2 import Markup
from jinja2 import StrictUndefined
from jinja2 import TemplateRuntimeError
from jinja2 import UndefinedError
diff --git a/tests/test_regression.py b/tests/test_regression.py
index 8e86e41..5d7a7fb 100644
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -613,7 +613,7 @@ class TestBug:
assert tmpl.render(values=[]) == "0"
def test_markup_and_chainable_undefined(self):
- from jinja2 import Markup
+ from markupsafe import Markup
from jinja2.runtime import ChainableUndefined
assert str(Markup(ChainableUndefined())) == ""
diff --git a/tests/test_security.py b/tests/test_security.py
index 1b64cd3..0e8dc5c 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -1,7 +1,7 @@
import pytest
+from markupsafe import escape
from jinja2 import Environment
-from jinja2 import escape
from jinja2.exceptions import SecurityError
from jinja2.exceptions import TemplateRuntimeError
from jinja2.exceptions import TemplateSyntaxError
diff --git a/tests/test_tests.py b/tests/test_tests.py
index 4d56a15..75178d6 100644
--- a/tests/test_tests.py
+++ b/tests/test_tests.py
@@ -1,7 +1,7 @@
import pytest
+from markupsafe import Markup
from jinja2 import Environment
-from jinja2 import Markup
from jinja2 import TemplateAssertionError
from jinja2 import TemplateRuntimeError