Replace whole repo with latest content from branch stream-2.10-rhel-8.8.0
Content corresponds with RHEL dist-git commit c50541c
This commit is contained in:
parent
4d935fc6e8
commit
706bbe1c65
@ -1 +0,0 @@
|
||||
1
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
||||
SOURCES/Jinja2-2.10.tar.gz
|
||||
/Jinja2-2.10.tar.gz
|
||||
/Jinja2-*.tar.gz
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 9a99db929323f60553b391c80d0395821121d593 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
Date: Tue, 19 Jan 2021 21:01:18 +0100
|
||||
Subject: [PATCH] add 'linetable' to the preserved CodeType attributes (#1334)
|
||||
|
||||
add 'linetable' to the preserved CodeType attributes
|
||||
|
||||
co_linetable replaces co_lnotab as part of PEP 626 in Python 3.10.
|
||||
---
|
||||
src/jinja2/debug.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/jinja2/debug.py b/src/jinja2/debug.py
|
||||
index 5d8aec3..e256617 100644
|
||||
--- a/src/jinja2/debug.py
|
||||
+++ b/src/jinja2/debug.py
|
||||
@@ -137,6 +137,7 @@ def fake_traceback(exc_value, tb, filename, lineno):
|
||||
"lnotab",
|
||||
"freevars",
|
||||
"cellvars",
|
||||
+ "linetable", # Python 3.10
|
||||
):
|
||||
if isinstance(attr, tuple):
|
||||
# Replace with given value.
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,49 +0,0 @@
|
||||
From 58250a709532ccb3e6d92ca65b3d305d1464cb68 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Krizek <martin.krizek@gmail.com>
|
||||
Date: Thu, 28 Jan 2021 10:08:50 +0100
|
||||
Subject: [PATCH] native_concat: pass only strings to literal_eval
|
||||
|
||||
If there is only single node and it is not a string, there is no point
|
||||
in passing it into ``literal_eval``, just return it immediately.
|
||||
|
||||
One of the examples where passing a non-string node into
|
||||
``literal_eval`` would actually cause problems is when the node is
|
||||
``Undefined``. On Python 3.10 this would cause ``UndefinedError``
|
||||
instead of just ``Undefined`` being returned.
|
||||
|
||||
Fixes #1335
|
||||
---
|
||||
CHANGES.rst | 3 +++
|
||||
src/jinja2/nativetypes.py | 2 ++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/CHANGES.rst b/CHANGES.rst
|
||||
index 511b22b..a8a66ea 100644
|
||||
--- a/CHANGES.rst
|
||||
+++ b/CHANGES.rst
|
||||
@@ -8,6 +8,9 @@ Released 2021-01-31
|
||||
- Improve the speed of the ``urlize`` filter by reducing regex
|
||||
backtracking. Email matching requires a word character at the start
|
||||
of the domain part, and only word characters in the TLD. :pr:`1343`
|
||||
+- Fix UndefinedError incorrectly being thrown on an undefined variable
|
||||
+ instead of ``Undefined`` being returned on
|
||||
+ ``NativeEnvironment`` on Python 3.10. :issue:`1335`
|
||||
|
||||
|
||||
Version 2.11.2
|
||||
diff --git a/src/jinja2/nativetypes.py b/src/jinja2/nativetypes.py
|
||||
index a9ead4e..2fee17f 100644
|
||||
--- a/src/jinja2/nativetypes.py
|
||||
+++ b/src/jinja2/nativetypes.py
|
||||
@@ -26,6 +26,8 @@ def native_concat(nodes):
|
||||
|
||||
if len(head) == 1:
|
||||
raw = head[0]
|
||||
+ if not isinstance(raw, str):
|
||||
+ return raw
|
||||
else:
|
||||
raw = u"".join([text_type(v) for v in chain(head, nodes)])
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (Jinja2-2.10.tar.gz) = 0ea7371be67ffcf19e46dfd06523a45a0806e678a407d54f5f2f3e573982f0959cf82ec5d07b203670309928a62ef71109701ab16547a9bba2ebcdc178cb67f2
|
||||
61ef1117f945486472850819b8d1eb3d Jinja2-2.10.tar.gz
|
||||
|
@ -1,7 +0,0 @@
|
||||
description: |
|
||||
Runs very simple jinja2 template which should always work
|
||||
test: python3 smoke.py
|
||||
framework: shell
|
||||
require:
|
||||
- python3
|
||||
- python3-jinja2
|
@ -1,9 +0,0 @@
|
||||
import jinja2
|
||||
|
||||
|
||||
TEMPLATE = "Text {{ variable }}"
|
||||
|
||||
environment = jinja2.Environment()
|
||||
template = environment.from_string(TEMPLATE)
|
||||
output = template.render(variable="demo")
|
||||
assert output == "Text demo", f"got: {output}"
|
Loading…
Reference in New Issue
Block a user