From: David Lord <davidism@gmail.com>
Date: Thu, 29 Dec 2022 18:39:27 +0000 (-0800)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36b601f24b30a91fe2fdc857116382bcb7655466;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

36b601f24b30a91fe2fdc857116382bcb7655466
diff --cc src/jinja2/loaders.py
index 5927320c,32f3a74e..57b55823
--- a/src/jinja2/loaders.py
+++ b/src/jinja2/loaders.py
@@@ -386,13 -386,16 +386,13 @@@ class PackageLoader(BaseLoader)
                  )
  
              # Package is a zip file.
 -            prefix = (
 -                self._template_root[len(self._archive) :].lstrip(os.path.sep)
 -                + os.path.sep
 -            )
 +            prefix = self._template_root[len(self._archive) :].lstrip(os.sep) + os.sep
              offset = len(prefix)
  
-             for name in self._loader._files.keys():  # type: ignore
+             for name in self._loader._files.keys():
                  # 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, "/"))
 +                if name.startswith(prefix) and name[-1] != os.sep:
 +                    results.append(name[offset:].replace(os.sep, "/"))
  
          results.sort()
          return results