diff options
author | David Lord <davidism@gmail.com> | 2024-05-13 12:34:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-13 12:34:50 -0700 |
commit | 8a8e2bc4d7605a5f717357e4043cde7a0aeacfd7 (patch) | |
tree | cd4498a5c3f2de463e63d92b4a2d6e7f5beec366 | |
parent | e82013c39970c336ed33906b3c38464f1fadbd30 (diff) | |
parent | 679af7f816ced8941ed5cf9b151a0cac543d0336 (diff) | |
download | jinja-upstream-3.1.x.tar.gz |
fix test_package_zip_list on 3.13 (#1979)upstream-3.1.x
-rw-r--r-- | src/jinja2/loaders.py | 32 | ||||
-rw-r--r-- | tests/test_loader.py | 2 |
2 files changed, 27 insertions, 7 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 3e64f62..e0cff67 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -363,7 +363,7 @@ def test_package_zip_source(package_zip_loader, template, expect): @pytest.mark.xfail( - sys.implementation.name == "pypy" or sys.version_info > (3, 13), + sys.implementation.name == "pypy", reason="zipimporter doesn't have a '_files' attribute", raises=TypeError, ) |