diff options
author | David Lord <davidism@gmail.com> | 2022-07-04 07:35:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-04 07:35:16 -0700 |
commit | fcefbe74720ad98cee6f495b9c2342acc75cea5b (patch) | |
tree | 888ddacdb0f0ff91779e340ff126c13486e2d6ef | |
parent | b08cd4bc64bb980df86ed2876978ae5735572280 (diff) | |
parent | dd22b7a10e84be0a507aba24470e4e6eb5a54b87 (diff) | |
download | jinja2-fcefbe74720ad98cee6f495b9c2342acc75cea5b.tar.gz |
Merge pull request #1681 from pallets/update-requirements
Update requirements
-rw-r--r-- | .pre-commit-config.yaml | 8 | ||||
-rw-r--r-- | requirements/dev.txt | 20 | ||||
-rw-r--r-- | requirements/docs.txt | 18 | ||||
-rw-r--r-- | requirements/tests.txt | 2 | ||||
-rw-r--r-- | requirements/typing.txt | 4 | ||||
-rw-r--r-- | src/jinja2/loaders.py | 34 |
6 files changed, 44 insertions, 42 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dca3e52..2291f1d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,18 +3,18 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.32.0 + rev: v2.34.0 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v3.1.0 + rev: v3.3.0 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] additional_dependencies: ["setuptools>60.9"] - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 @@ -27,7 +27,7 @@ repos: hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace diff --git a/requirements/dev.txt b/requirements/dev.txt index c9bcd60..470cc78 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,31 +8,33 @@ -r docs.txt -r tests.txt -r typing.txt +build==0.8.0 + # via pip-tools cfgv==3.3.1 # via pre-commit -click==8.1.2 +click==8.1.3 # via # pip-compile-multi # pip-tools distlib==0.3.4 # via virtualenv -filelock==3.6.0 +filelock==3.7.1 # via # tox # virtualenv -identify==2.5.0 +identify==2.5.1 # via pre-commit -nodeenv==1.6.0 +nodeenv==1.7.0 # via pre-commit pep517==0.12.0 - # via pip-tools + # via build pip-compile-multi==2.4.5 # via -r requirements/dev.in -pip-tools==6.6.0 +pip-tools==6.8.0 # via pip-compile-multi platformdirs==2.5.2 # via virtualenv -pre-commit==2.18.1 +pre-commit==2.19.0 # via -r requirements/dev.in pyyaml==6.0 # via pre-commit @@ -46,9 +48,9 @@ toml==0.10.2 # tox toposort==1.7 # via pip-compile-multi -tox==3.25.0 +tox==3.25.1 # via -r requirements/dev.in -virtualenv==20.14.1 +virtualenv==20.15.1 # via # pre-commit # tox diff --git a/requirements/docs.txt b/requirements/docs.txt index 88f6279..9f1f1b3 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -7,19 +7,19 @@ # alabaster==0.7.12 # via sphinx -babel==2.10.1 +babel==2.10.3 # via sphinx -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.0 # via requests -docutils==0.17.1 +docutils==0.18.1 # via sphinx idna==3.3 # via requests -imagesize==1.3.0 +imagesize==1.4.1 # via sphinx -jinja2==3.1.1 +jinja2==3.1.2 # via sphinx markupsafe==2.1.1 # via jinja2 @@ -31,15 +31,15 @@ pallets-sphinx-themes==2.0.2 # via -r requirements/docs.in pygments==2.12.0 # via sphinx -pyparsing==3.0.8 +pyparsing==3.0.9 # via packaging pytz==2022.1 # via babel -requests==2.27.1 +requests==2.28.1 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==4.5.0 +sphinx==5.0.2 # via # -r requirements/docs.in # pallets-sphinx-themes diff --git a/requirements/tests.txt b/requirements/tests.txt index 4cd3fe9..753d04a 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -15,7 +15,7 @@ pluggy==1.0.0 # via pytest py==1.11.0 # via pytest -pyparsing==3.0.8 +pyparsing==3.0.9 # via packaging pytest==7.1.2 # via -r requirements/tests.in diff --git a/requirements/typing.txt b/requirements/typing.txt index 2d97fef..dc9f050 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -5,11 +5,11 @@ # # pip-compile-multi # -mypy==0.950 +mypy==0.961 # via -r requirements/typing.in mypy-extensions==0.4.3 # via mypy tomli==2.0.1 # via mypy -typing-extensions==4.2.0 +typing-extensions==4.3.0 # via mypy diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py index d2f9809..caebf80 100644 --- a/src/jinja2/loaders.py +++ b/src/jinja2/loaders.py @@ -15,7 +15,6 @@ from types import ModuleType from .exceptions import TemplateNotFound from .utils import internalcode -from .utils import open_if_exists if t.TYPE_CHECKING: from .environment import Environment @@ -193,29 +192,30 @@ class FileSystemLoader(BaseLoader): self, environment: "Environment", template: str ) -> t.Tuple[str, str, t.Callable[[], bool]]: pieces = split_template_path(template) + for searchpath in self.searchpath: # Use posixpath even on Windows to avoid "drive:" or UNC # segments breaking out of the search directory. filename = posixpath.join(searchpath, *pieces) - f = open_if_exists(filename) - if f is None: - continue - try: - contents = f.read().decode(self.encoding) - finally: - f.close() - mtime = os.path.getmtime(filename) + if os.path.isfile(filename): + break + else: + raise TemplateNotFound(template) + + with open(filename, encoding=self.encoding) as f: + contents = f.read() - def uptodate() -> bool: - try: - return os.path.getmtime(filename) == mtime - except OSError: - return False + mtime = os.path.getmtime(filename) - # Use normpath to convert Windows altsep to sep. - return contents, os.path.normpath(filename), uptodate - raise TemplateNotFound(template) + def uptodate() -> bool: + try: + return os.path.getmtime(filename) == mtime + except OSError: + return False + + # Use normpath to convert Windows altsep to sep. + return contents, os.path.normpath(filename), uptodate def list_templates(self) -> t.List[str]: found = set() |