Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance

11 files changed, 7 insertions, 17 deletions

diff --git a/README.rst b/README.rst
index 44571dc..c36b942 100644
--- a/README.rst
+++ b/README.rst
@@ -46,6 +46,6 @@ Builds
 | ``master``          | .. image:: https://travis-ci.org/pallets/jinja.svg?branch=master             |
 |                     |     :target: https://travis-ci.org/pallets/jinja                             |
 +---------------------+------------------------------------------------------------------------------+
-| ``2.7-maintenance`` | .. image:: https://travis-ci.org/pallets/jinja.svg?branch=2.7-maintenance    |
+| ``2.9-maintenance`` | .. image:: https://travis-ci.org/pallets/jinja.svg?branch=2.9-maintenance    |
 |                     |     :target: https://travis-ci.org/pallets/jinja                             |
 +---------------------+------------------------------------------------------------------------------+
diff --git a/jinja2/asyncsupport.py b/jinja2/asyncsupport.py
index 33a1a07..6e82d75 100644
--- a/jinja2/asyncsupport.py
+++ b/jinja2/asyncsupport.py
@@ -14,7 +14,7 @@ import asyncio
 import inspect
 from functools import update_wrapper
 
-from jinja2.utils import concat, internalcode, concat, Markup
+from jinja2.utils import concat, internalcode, Markup
 from jinja2.environment import TemplateModule
 from jinja2.runtime import LoopContextBase, _last_iteration
 
diff --git a/jinja2/ext.py b/jinja2/ext.py
index 03c63e1..75e1f3b 100644
--- a/jinja2/ext.py
+++ b/jinja2/ext.py
@@ -87,7 +87,7 @@ class Extension(with_metaclass(ExtensionRegistry, object)):
     def filter_stream(self, stream):
         """It's passed a :class:`~jinja2.lexer.TokenStream` that can be used
         to filter tokens returned.  This method has to return an iterable of
-        :class:`~jinja2.lexer.Token`\s, but it doesn't have to return a
+        :class:`~jinja2.lexer.Token`\\s, but it doesn't have to return a
         :class:`~jinja2.lexer.TokenStream`.
 
         In the `ext` folder of the Jinja2 source distribution there is a file
diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index b646cb9..13c62da 100644
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -20,8 +20,7 @@ from operator import itemgetter
 from collections import deque
 from jinja2.exceptions import TemplateSyntaxError
 from jinja2.utils import LRUCache
-from jinja2._compat import iteritems, implements_iterator, text_type, \
-     intern, PY2
+from jinja2._compat import iteritems, implements_iterator, text_type, intern
 
 
 # cache for the lexers. Exists in order to be able to have multiple
diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py
index 9e00322..32e2435 100644
--- a/jinja2/sandbox.py
+++ b/jinja2/sandbox.py
@@ -17,7 +17,7 @@ import operator
 from collections import Mapping
 from jinja2.environment import Environment
 from jinja2.exceptions import SecurityError
-from jinja2._compat import string_types, text_type, PY2
+from jinja2._compat import string_types, PY2
 from jinja2.utils import Markup
 
 from markupsafe import EscapeFormatter
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 1301d22..30f5931 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
 
diff --git a/tox.ini b/tox.ini
index 388fb05..03402f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,py34,py35
+envlist = py26,py27,pypy,py33,py34,py35,py36
 
 [testenv]
 commands = py.test {posargs}