From 81f300b434ec3e8031b5520deb56d16f76150ecb Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 22 Jun 2021 23:03:10 +0200 Subject: [PATCH] Update to 3.0.1 --- ...-the-preserved-CodeType-attributes-1.patch | 27 ---------- ...at-pass-only-strings-to-literal_eval.patch | 49 ------------------- ...re-get_event_loop-DeprecationWarning.patch | 12 ----- python-jinja2.spec | 14 +++--- sources | 2 +- 5 files changed, 7 insertions(+), 97 deletions(-) delete mode 100644 0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch delete mode 100644 0002-native_concat-pass-only-strings-to-literal_eval.patch delete mode 100644 0003-ignore-get_event_loop-DeprecationWarning.patch diff --git a/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch b/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch deleted file mode 100644 index 7840d4f..0000000 --- a/0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9a99db929323f60553b391c80d0395821121d593 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny -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 - diff --git a/0002-native_concat-pass-only-strings-to-literal_eval.patch b/0002-native_concat-pass-only-strings-to-literal_eval.patch deleted file mode 100644 index 3e0e76a..0000000 --- a/0002-native_concat-pass-only-strings-to-literal_eval.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 58250a709532ccb3e6d92ca65b3d305d1464cb68 Mon Sep 17 00:00:00 2001 -From: Martin Krizek -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 - diff --git a/0003-ignore-get_event_loop-DeprecationWarning.patch b/0003-ignore-get_event_loop-DeprecationWarning.patch deleted file mode 100644 index f8586ed..0000000 --- a/0003-ignore-get_event_loop-DeprecationWarning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 3387720..fa69df8 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -10,6 +10,7 @@ testpaths = tests - filterwarnings = - error - ignore:the sets module:DeprecationWarning:jinja2.sandbox -+ ignore:There is no current event loop:DeprecationWarning - - [coverage:run] - branch = True diff --git a/python-jinja2.spec b/python-jinja2.spec index cf9da7c..1133f78 100644 --- a/python-jinja2.spec +++ b/python-jinja2.spec @@ -1,17 +1,12 @@ %global srcname Jinja2 Name: python-jinja2 -Version: 2.11.3 -Release: 3%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: General purpose template engine License: BSD URL: https://palletsprojects.com/p/jinja/ Source0: %{pypi_source} -# cherry-picked patches to build with Python 3.10 (#1907442) -Patch1: 0001-add-linetable-to-the-preserved-CodeType-attributes-1.patch -Patch2: 0002-native_concat-pass-only-strings-to-literal_eval.patch -# temporarily ignore DeprecationWarning in get_event_loop() in tests -Patch3: 0003-ignore-get_event_loop-DeprecationWarning.patch %if 0%{?fedora} || 0%{?rhel} > 7 # Enable python3 build by default @@ -173,7 +168,6 @@ PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests %if %{with python3} %files -n python3-jinja2 %doc CHANGES.rst -%doc ext %doc examples %license LICENSE.rst %if %{with docs} @@ -185,6 +179,10 @@ PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests %changelog +* Tue Jun 22 2021 Lumír Balhar - 3.0.1-1 +- Update to 3.0.1 +- Resolves: rhbz#1961862 + * Fri Jun 04 2021 Python Maint - 2.11.3-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index a742c89..166072d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Jinja2-2.11.3.tar.gz) = fce4f835795fe9afb622f8106f60344032a811f3f693806f31ba482f9b7c1400f93dfa1701b4db0b472cbed4b0793cb329778c8091811ef0e3b577150d28e004 +SHA512 (Jinja2-3.0.1.tar.gz) = 18ca56fb2271885c41982d2a3b2daa8bdc7a95191f54d8eec96ddbe001ac995b3fae766b603d8c9287413e5227062b771575012cd92a3f64ed76067d5f168701