python3-jinja2: upgrade 3.1.4 -> 3.1.5

(From OE-Core rev: fca4fe9282d5895cc961aef82471604d219cb3ba)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-01-08 17:49:16 +01:00
committed by Richard Purdie
parent 5ffd270c60
commit 335889b619
2 changed files with 5 additions and 91 deletions

View File

@@ -1,87 +0,0 @@
From cf6ba7732b49ab4637aa747186cf1d1572688584 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Mon, 13 May 2024 18:02:35 +0100
Subject: [PATCH] fix test_package_zip_list on 3.13
Upstream-Status: Backport [https://github.com/pallets/jinja/pull/1979]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
src/jinja2/loaders.py | 32 ++++++++++++++++++++++++++------
tests/test_loader.py | 4 ++--
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py
index 9eaf647..8c2c86c 100644
--- a/src/jinja2/loaders.py
+++ b/src/jinja2/loaders.py
@@ -238,6 +238,30 @@ class FileSystemLoader(BaseLoader):
return sorted(found)
+if sys.version_info >= (3, 13):
+
+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
+ try:
+ get_files = z._get_files
+ except AttributeError as e:
+ raise TypeError(
+ "This zip import does not have the required"
+ " metadata to list templates."
+ ) from e
+ return get_files()
+else:
+
+ def _get_zipimporter_files(z: t.Any) -> t.Dict[str, object]:
+ try:
+ files = z._files
+ except AttributeError as e:
+ raise TypeError(
+ "This zip import does not have the required"
+ " metadata to list templates."
+ ) from e
+ return files # type: ignore[no-any-return]
+
+
class PackageLoader(BaseLoader):
"""Load templates from a directory in a Python package.
@@ -382,11 +406,7 @@ class PackageLoader(BaseLoader):
for name in filenames
)
else:
- if not hasattr(self._loader, "_files"):
- raise TypeError(
- "This zip import does not have the required"
- " metadata to list templates."
- )
+ files = _get_zipimporter_files(self._loader)
# Package is a zip file.
prefix = (
@@ -395,7 +415,7 @@ class PackageLoader(BaseLoader):
)
offset = len(prefix)
- for name in self._loader._files.keys():
+ for name in files:
# Find names under the templates directory that aren't directories.
if name.startswith(prefix) and name[-1] != os.path.sep:
results.append(name[offset:].replace(os.path.sep, "/"))
diff --git a/tests/test_loader.py b/tests/test_loader.py
index 77d686e..e0683e4 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -364,8 +364,8 @@ def test_package_zip_source(package_zip_loader, template, expect):
@pytest.mark.xfail(
- platform.python_implementation() == "PyPy",
- reason="PyPy's zipimporter doesn't have a '_files' attribute.",
+ sys.implementation.name == "pypy",
+ reason="zipimporter doesn't have a '_files' attribute",
raises=TypeError,
)
def test_package_zip_list(package_zip_loader):
--
2.39.5

View File

@@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462"
SRC_URI[sha256sum] = "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"
SRC_URI[sha256sum] = "8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb"
PYPI_PACKAGE = "jinja2"
@@ -14,9 +14,10 @@ CLEANBROKEN = "1"
inherit pypi python_flit_core ptest-python-pytest
SRC_URI += " \
file://fix-3.13.patch \
"
do_install_ptest:append() {
# test_async items require trio module
rm -f ${D}${PTEST_PATH}/tests/test_async.py ${D}${PTEST_PATH}/tests/test_async_filters.py
}
RDEPENDS:${PN}-ptest += " \
python3-unixadmin \