Compare commits
No commits in common. "imports/c9-beta/python-jinja2-2.11.3-4.el9" and "c8-stream-3.8" have entirely different histories.
imports/c9
...
c8-stream-
@ -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
|
|
||||||
|
|
@ -2,14 +2,12 @@
|
|||||||
|
|
||||||
Name: python-jinja2
|
Name: python-jinja2
|
||||||
Version: 2.11.3
|
Version: 2.11.3
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: General purpose template engine
|
Summary: General purpose template engine
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://palletsprojects.com/p/jinja/
|
URL: https://palletsprojects.com/p/jinja/
|
||||||
Source0: %{pypi_source}
|
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
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
# Enable python3 build by default
|
# Enable python3 build by default
|
||||||
@ -18,14 +16,15 @@ Patch2: 0002-native_concat-pass-only-strings-to-literal_eval.patch
|
|||||||
%bcond_with python3
|
%bcond_with python3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} > 33 || 0%{?rhel} > 7
|
%if 0%{?rhel} > 7
|
||||||
# Disable python2 build by default
|
# Disable python2 build by default
|
||||||
%bcond_with python2
|
%bcond_with python2
|
||||||
%else
|
%else
|
||||||
%bcond_without python2
|
%bcond_without python2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# No docs in RHEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=1944567
|
# Enable building without docs to avoid a circular dependency between this
|
||||||
|
# and python-sphinx:
|
||||||
%bcond_with docs
|
%bcond_with docs
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
@ -35,6 +34,10 @@ Patch2: 0002-native_concat-pass-only-strings-to-literal_eval.patch
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
||||||
|
# x86_64 compose of CRB, but we don't want to ship it at all.
|
||||||
|
# See: https://projects.engineering.redhat.com/browse/RCM-72605
|
||||||
|
ExcludeArch: i686
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Jinja2 is a template engine written in pure Python. It provides a
|
Jinja2 is a template engine written in pure Python. It provides a
|
||||||
@ -74,26 +77,27 @@ environments.
|
|||||||
|
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
%package -n python3-jinja2
|
%package -n python%{python3_pkgversion}-jinja2
|
||||||
Summary: General purpose template engine for python3
|
Summary: General purpose template engine for python3
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: python3-babel >= 0.8
|
BuildRequires: python%{python3_pkgversion}-babel >= 0.8
|
||||||
BuildRequires: python3-markupsafe >= 0.23
|
BuildRequires: python%{python3_pkgversion}-markupsafe >= 0.23
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python%{python3_pkgversion}-pytest
|
||||||
|
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
BuildRequires: %{_bindir}/sphinx-build-3
|
BuildRequires: %{_bindir}/sphinx-build-3.8
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: python3-Pallets-Sphinx-Themes
|
BuildRequires: python%{python3_pkgversion}-Pallets-Sphinx-Themes
|
||||||
BuildRequires: python3-sphinxcontrib-log-cabinet
|
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-log-cabinet
|
||||||
BuildRequires: python3-sphinx-issues
|
BuildRequires: python%{python3_pkgversion}-sphinx-issues
|
||||||
%endif
|
%endif
|
||||||
Requires: python3-babel >= 0.8
|
Requires: python%{python3_pkgversion}-babel >= 0.8
|
||||||
Requires: python3-markupsafe >= 0.23
|
Requires: python%{python3_pkgversion}-markupsafe >= 0.23
|
||||||
Requires: python3-setuptools
|
Requires: python%{python3_pkgversion}-setuptools
|
||||||
%{?python_provide:%python_provide python3-jinja2}
|
%{?python_provide:%python_provide python%{python3_pkgversion}-jinja2}
|
||||||
|
|
||||||
%description -n python3-jinja2
|
%description -n python%{python3_pkgversion}-jinja2
|
||||||
Jinja2 is a template engine written in pure Python. It provides a
|
Jinja2 is a template engine written in pure Python. It provides a
|
||||||
Django inspired non-XML syntax but supports inline expressions and an
|
Django inspired non-XML syntax but supports inline expressions and an
|
||||||
optional sandboxed environment.
|
optional sandboxed environment.
|
||||||
@ -120,7 +124,7 @@ find . -name '*.pyo' -o -name '*.pyc' -delete
|
|||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
%py3_build
|
%py3_build
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
make -C docs html PYTHONPATH=$(pwd)/src SPHINXBUILD=sphinx-build-3
|
make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
|
||||||
# remove hidden file
|
# remove hidden file
|
||||||
rm -rf docs/_build/html/.buildinfo
|
rm -rf docs/_build/html/.buildinfo
|
||||||
%endif # with docs
|
%endif # with docs
|
||||||
@ -149,7 +153,7 @@ rm %{buildroot}%{python3_sitelib}/jinja2/asyncfilters.py
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests
|
PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest tests
|
||||||
%endif # with python3
|
%endif # with python3
|
||||||
|
|
||||||
|
|
||||||
@ -162,13 +166,13 @@ PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests
|
|||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%doc docs/_build/html
|
%doc docs/_build/html
|
||||||
%endif
|
%endif
|
||||||
%{python2_sitelib}/jinja2/
|
%{python2_sitelib}/jinja2
|
||||||
%{python2_sitelib}/Jinja2-*.egg-info/
|
%{python2_sitelib}/Jinja2-%{version}-py?.?.egg-info
|
||||||
%endif # with python2
|
%endif # with python2
|
||||||
|
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
%files -n python3-jinja2
|
%files -n python%{python3_pkgversion}-jinja2
|
||||||
%doc CHANGES.rst
|
%doc CHANGES.rst
|
||||||
%doc ext
|
%doc ext
|
||||||
%doc examples
|
%doc examples
|
||||||
@ -176,62 +180,27 @@ PYTHONPATH=$(pwd)/src %{__python3} -m pytest tests
|
|||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%doc docs/_build/html
|
%doc docs/_build/html
|
||||||
%endif
|
%endif
|
||||||
%{python3_sitelib}/jinja2/
|
%{python3_sitelib}/jinja2
|
||||||
%{python3_sitelib}/Jinja2-*.egg-info/
|
%{python3_sitelib}/Jinja2-%{version}-py?.?.egg-info
|
||||||
%endif # with python3
|
%endif # with python3
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.3-4
|
* Fri May 20 2022 Maxwell G <gotmax@e.email> - 2.11.3-1
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.11.3-3
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Tue Apr 13 2021 Miro Hrončok <mhroncok@redhat.com> - 2.11.3-2
|
|
||||||
- Disable documentation
|
|
||||||
- Resolves: rhbz#1944567
|
|
||||||
|
|
||||||
* Sat Feb 6 2021 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.3-1
|
|
||||||
- Update to 2.11.3.
|
- Update to 2.11.3.
|
||||||
- Add patches to build with Python 3.10 (#1907442).
|
- Fix URL.
|
||||||
|
- Remove patch that is included in this release.
|
||||||
|
Resolves: rhbz#2086141.
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.2-8
|
* Fri Mar 12 2021 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Fix CVE-2020-28493: ReDOS vulnerability due to the sub-pattern
|
||||||
|
Resolves: rhbz#1928707
|
||||||
|
|
||||||
* Mon Dec 21 2020 Miro Hrončok <mhroncok@redhat.com> - 2.11.2-7
|
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.10.3-4
|
||||||
- Drop python2-jinja2 on Fedora 34+
|
- Exclude unsupported i686 arch
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.2-6
|
* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.10.3-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Adjusted for Python 3.8 module in RHEL 8
|
||||||
|
|
||||||
* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 2.11.2-5
|
|
||||||
- Rebuilt for Python 3.9
|
|
||||||
|
|
||||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.11.2-4
|
|
||||||
- Bootstrap for Python 3.9
|
|
||||||
|
|
||||||
* Fri May 22 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.2-3
|
|
||||||
- Re-add python2 subpackage (#1832057).
|
|
||||||
|
|
||||||
* Wed May 6 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.2-2
|
|
||||||
- Drop python2 subpackage from F33 on (#1832057).
|
|
||||||
|
|
||||||
* Wed Apr 15 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.2-1
|
|
||||||
- Re-add dependency on python-setuptools.
|
|
||||||
|
|
||||||
* Wed Apr 15 2020 Dan Horák <dan[at]danny.cz> - 2.11.2-1
|
|
||||||
- Update to 2.11.2
|
|
||||||
|
|
||||||
* Mon Apr 06 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.11.1-2
|
|
||||||
- Drop unneeded R: pythonX-setuptools
|
|
||||||
|
|
||||||
* Sat Feb 8 2020 Thomas Moschny <thomas.moschny@gmx.de> - 2.11.1-1
|
|
||||||
- Update to 2.11.1.
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.3-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Nov 20 2019 Thomas Moschny <thomas.moschny@gmx.de> - 2.10.3-2
|
* Wed Nov 20 2019 Thomas Moschny <thomas.moschny@gmx.de> - 2.10.3-2
|
||||||
- Add missing BR on make.
|
- Add missing BR on make.
|
||||||
|
Loading…
Reference in New Issue
Block a user