Parse test variable as conditional expression

This was necessary to fix some of the tests for tests which relied
on parentheses in place.

diff --git a/grammar.ebnf b/grammar.ebnf
index 8620f99422fe52328b50518bf44bfe392e3b81ff..5960a1a6e3c75874a17b6a1c2d8e70ce60f5eb42 100644 (file)
--- a/grammar.ebnf
+++ b/grammar.ebnf
@@ -243,12 +243,12 @@ conditional_expression
     | complex_expression_math2\r
     | concatenate_expression\r
     | complex_expression_math1\r
-    | conditional_expression_parentheses\r
     | conditional_expression_not\r
     | conditional_expression_if\r
     | conditional_expression_logical\r
     | conditional_expression_operator\r
     | conditional_expression_test\r
+    | conditional_expression_parentheses\r
     | variable_identifier\r
     ;\r
 \r

diff --git a/src/jinja2/new_parser.py b/src/jinja2/new_parser.py
index ea34f9bb2e6df9eca50fe6cfabe0c31b7126096a..e8632f42151c4ed73c8b22564c09a117fbd65671 100644 (file)
--- a/src/jinja2/new_parser.py
+++ b/src/jinja2/new_parser.py
@@ -542,7 +542,7 @@ def parse_conditional_expression_operator(ast):
     )\r
 \r
 def parse_conditional_expression_test(ast):\r
-    node = parse_variable(ast['test_variable'])\r
+    node = parse_conditional_expression(ast['test_variable'])\r
     test_function = parse_variable(ast['test_function'])\r
 \r
     args = []\r