From: Kevin Brown <kevin@kevin-brown.com>
Date: Fri, 15 May 2020 00:05:43 +0000 (-0400)
Subject: Parse test variable as conditional expression
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d473e0e8a0de1b02ebc7d634401edbf149579c3;p=thirdparty%2Fjinja.git

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 8620f994..5960a1a6 100644
--- a/grammar.ebnf
+++ b/grammar.ebnf
@@ -243,12 +243,12 @@ conditional_expression
     | complex_expression_math2
     | concatenate_expression
     | complex_expression_math1
-    | conditional_expression_parentheses
     | conditional_expression_not
     | conditional_expression_if
     | conditional_expression_logical
     | conditional_expression_operator
     | conditional_expression_test
+    | conditional_expression_parentheses
     | variable_identifier
     ;
 
diff --git a/src/jinja2/new_parser.py b/src/jinja2/new_parser.py
index ea34f9bb..e8632f42 100644
--- a/src/jinja2/new_parser.py
+++ b/src/jinja2/new_parser.py
@@ -542,7 +542,7 @@ def parse_conditional_expression_operator(ast):
     )
 
 def parse_conditional_expression_test(ast):
-    node = parse_variable(ast['test_variable'])
+    node = parse_conditional_expression(ast['test_variable'])
     test_function = parse_variable(ast['test_function'])
 
     args = []