From: David Lord <davidism@gmail.com>
Date: Fri, 7 Jul 2017 16:51:31 +0000 (-0700)
Subject: add test and changelog
X-Git-Tag: 2.10~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F617%2Fhead;p=thirdparty%2Fjinja.git

add test and changelog
---

diff --git a/CHANGES b/CHANGES
index 500af4e4..aaae3ad8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,11 +28,12 @@ Version 2.10
 - Add ``min`` and ``max`` filters. (`#475`_)
 - Add tests for all comparison operators: ``eq``, ``ne``, ``lt``, ``le``,
   ``gt``, ``ge``. (`#665`_)
-- ``import`` statement cannot end with a trailing comma. (`#618`_)
+- ``import`` statement cannot end with a trailing comma. (`#617`_, `#618`_)
 
 .. _#469: https://github.com/pallets/jinja/pull/469
 .. _#475: https://github.com/pallets/jinja/pull/475
 .. _#478: https://github.com/pallets/jinja/pull/478
+.. _#617: https://github.com/pallets/jinja/pull/617
 .. _#618: https://github.com/pallets/jinja/pull/618
 .. _#665: https://github.com/pallets/jinja/pull/665
 
diff --git a/tests/test_imports.py b/tests/test_imports.py
index 4250eb9d..65aae43f 100644
--- a/tests/test_imports.py
+++ b/tests/test_imports.py
@@ -75,6 +75,12 @@ class TestImports(object):
         test_env.from_string('{% from "foo" import bar, with, context %}')
         test_env.from_string('{% from "foo" import bar, with with context %}')
 
+        with pytest.raises(TemplateSyntaxError):
+            test_env.from_string('{% from "foo" import bar,, with context %}')
+
+        with pytest.raises(TemplateSyntaxError):
+            test_env.from_string('{% from "foo" import bar with context, %}')
+
     def test_exports(self, test_env):
         m = test_env.from_string('''
             {% macro toplevel() %}...{% endmacro %}