diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2017-01-09 11:05:46 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2017-01-09 11:05:46 +0100 |
| commit | b08861945784415497372439c2407d6cfa568a83 (patch) | |
| tree | d1b8173014e8888e2de5cd8fb83f91c66ca3fd69 /tests | |
| parent | d66b81b73c5e963b4c9aecbe35ae1b1fbeadf1d9 (diff) | |
| parent | a7d4ec51f256568c3f0181a830cbc6b4cf0dc222 (diff) | |
| download | jinja2-b08861945784415497372439c2407d6cfa568a83.tar.gz | |
Merge branch '2.9-maintenance'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 4 | ||||
| -rw-r--r-- | tests/test_async.py | 1 | ||||
| -rw-r--r-- | tests/test_debug.py | 2 | ||||
| -rw-r--r-- | tests/test_ext.py | 2 | ||||
| -rw-r--r-- | tests/test_idtracking.py | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 1830b1e..04ac784 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,12 +10,8 @@ """ import pytest import os -import re -import sys -from traceback import format_exception from jinja2 import loaders -from jinja2._compat import PY2 from jinja2.utils import have_async_gen from jinja2 import Environment diff --git a/tests/test_async.py b/tests/test_async.py index 5e7e198..88590c7 100644 --- a/tests/test_async.py +++ b/tests/test_async.py @@ -2,7 +2,6 @@ import pytest import asyncio from jinja2 import Template, Environment, DictLoader -from jinja2.utils import have_async_gen from jinja2.exceptions import TemplateNotFound, TemplatesNotFound, \ UndefinedError diff --git a/tests/test_debug.py b/tests/test_debug.py index 22ce1e8..a158524 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -11,12 +11,10 @@ import pytest import re - import sys from traceback import format_exception from jinja2 import Environment, TemplateSyntaxError -from traceback import format_exception @pytest.fixture diff --git a/tests/test_ext.py b/tests/test_ext.py index 8966107..65a30ca 100644 --- a/tests/test_ext.py +++ b/tests/test_ext.py @@ -19,7 +19,7 @@ from jinja2._compat import BytesIO, itervalues, text_type importable_object = 23 -_gettext_re = re.compile(r'_\((.*?)\)(?s)') +_gettext_re = re.compile(r'_\((.*?)\)', re.DOTALL) i18n_templates = { diff --git a/tests/test_idtracking.py b/tests/test_idtracking.py index 5379899..ea01b17 100644 --- a/tests/test_idtracking.py +++ b/tests/test_idtracking.py @@ -1,5 +1,3 @@ -import pytest - from jinja2 import nodes from jinja2.idtracking import symbols_for_node |