native: keep same behavior on Python 3.10

diff --git a/CHANGES.rst b/CHANGES.rst
index de9bd455819bdde20672eb3e5dd879a6f67182a9..e859ab3fa7b84811cedffb8f29d4b786b024ead4 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,8 @@ Unreleased
 
 -   Fix traceback rewriting internals for Python 3.10 and 3.11.
     :issue:`1535`
+-   Fix how the native environment treats leading and trailing spaces
+    when parsing values on Python 3.10. :pr:`1537`
 
 
 Version 3.0.2

diff --git a/src/jinja2/nativetypes.py b/src/jinja2/nativetypes.py
index 88eeecc497f4a1021052a14fcb24d88241e98a11..20597d50ab910a7b7e1f9365bb441a9e10a6f71a 100644 (file)
--- a/src/jinja2/nativetypes.py
+++ b/src/jinja2/nativetypes.py
@@ -1,5 +1,6 @@
 import typing as t
 from ast import literal_eval
+from ast import parse
 from itertools import chain
 from itertools import islice
 
@@ -33,7 +34,12 @@ def native_concat(values: t.Iterable[t.Any]) -> t.Optional[t.Any]:
         raw = "".join([str(v) for v in chain(head, values)])
 
     try:
-        return literal_eval(raw)
+        return literal_eval(
+            # In Python 3.10+ ast.literal_eval removes leading spaces/tabs
+            # from the given string. For backwards compatibility we need to
+            # parse the string ourselves without removing leading spaces/tabs.
+            parse(raw, mode="eval")
+        )
     except (ValueError, SyntaxError, MemoryError):
         return raw
 

diff --git a/tests/test_nativetypes.py b/tests/test_nativetypes.py
index 22581813c009fab66e37a3f50996bc17b9289138..9bae938cdb3438a98fe8c000d153cc3f766d0dbc 100644 (file)
--- a/tests/test_nativetypes.py
+++ b/tests/test_nativetypes.py
@@ -147,3 +147,9 @@ def test_no_intermediate_eval(env):
 def test_spontaneous_env():
     t = NativeTemplate("{{ true }}")
     assert isinstance(t.environment, NativeEnvironment)
+
+
+def test_leading_spaces(env):
+    t = env.from_string(" {{ True }}")
+    result = t.render()
+    assert result == " True"