orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[pre-commit.ci lite] apply automatic fixes

Browse source
This commit is contained in:
pre-commit-ci-lite[bot] 2025-05-20 11:01:02 +00:00 • committed by GitHub
parent 063544167d
commit 914b3bfdd0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/flask/app.py
View file

@ -232,8 +232,7 @@ class Flask(App):
host_matching: bool = False, host_matching: bool = False,
subdomain_matching: bool = False, subdomain_matching: bool = False,
template_folder: ( template_folder: (
str | os.PathLike[str] | str | os.PathLike[str] | t.Sequence[str | os.PathLike[str]] | None
t.Sequence[t.Union[str, "os.PathLike[str]"]] | None
) = "templates", ) = "templates",
instance_path: str | None = None, instance_path: str | None = None,
instance_relative_config: bool = False, instance_relative_config: bool = False,

5
src/flask/blueprints.py
View file

@ -23,9 +23,8 @@ class Blueprint(SansioBlueprint):
static_folder: str | os.PathLike[str] | None = None, static_folder: str | os.PathLike[str] | None = None,
static_url_path: str | None = None, static_url_path: str | None = None,
template_folder: ( template_folder: (
str | os.PathLike[str] | None | str | os.PathLike[str] | None | t.Sequence[str | os.PathLike[str]] | None
t.Sequence[t.Union[str, "os.PathLike[str]"]] | None ) = None,
)= None,
url_prefix: str | None = None, url_prefix: str | None = None,
subdomain: str | None = None, subdomain: str | None = None,
url_defaults: dict[str, t.Any] | None = None, url_defaults: dict[str, t.Any] | None = None,

3
src/flask/sansio/app.py
View file

@ -288,8 +288,7 @@ class App(Scaffold):
host_matching: bool = False, host_matching: bool = False,
subdomain_matching: bool = False, subdomain_matching: bool = False,
template_folder: ( template_folder: (
str | os.PathLike[str] | str | os.PathLike[str] | t.Sequence[str | os.PathLike[str]] | None
t.Sequence[t.Union[str, "os.PathLike[str]"]] | None
) = "templates", ) = "templates",
instance_path: str | None = None, instance_path: str | None = None,
instance_relative_config: bool = False, instance_relative_config: bool = False,

3
src/flask/sansio/blueprints.py
View file

@ -179,8 +179,7 @@ class Blueprint(Scaffold):
static_folder: str | os.PathLike[str] | None = None, static_folder: str | os.PathLike[str] | None = None,
static_url_path: str | None = None, static_url_path: str | None = None,
template_folder: ( template_folder: (
str | os.PathLike[str] | str | os.PathLike[str] | t.Sequence[str | os.PathLike[str]] | None
t.Sequence[t.Union[str, "os.PathLike[str]"]] | None
) = None, ) = None,
url_prefix: str | None = None, url_prefix: str | None = None,
subdomain: str | None = None, subdomain: str | None = None,

21
src/flask/sansio/scaffold.py
View file

@ -6,7 +6,6 @@ import pathlib
import sys import sys
import typing as t import typing as t
from collections import defaultdict from collections import defaultdict
from collections.abc import Sequence
from functools import update_wrapper from functools import update_wrapper
from jinja2 import BaseLoader from jinja2 import BaseLoader
@ -79,8 +78,7 @@ class Scaffold:
static_folder: str | os.PathLike[str] | None = None, static_folder: str | os.PathLike[str] | None = None,
static_url_path: str | None = None, static_url_path: str | None = None,
template_folder: ( template_folder: (
str | os.PathLike[str] | str | os.PathLike[str] | t.Sequence[str | os.PathLike[str]] | None
t.Sequence[t.Union[str, "os.PathLike[str]"]] | None
) = None, ) = None,
root_path: str | None = None, root_path: str | None = None,
): ):
@ -284,14 +282,15 @@ class Scaffold:
if self.template_folder is None: if self.template_folder is None:
return None return None
if isinstance(self.template_folder, str): if isinstance(self.template_folder, str):
return FileSystemLoader( return FileSystemLoader(os.path.join(self.root_path, self.template_folder))
os.path.join(self.root_path, self.template_folder) return FileSystemLoader(
) [
return FileSystemLoader([ folder
folder if isinstance(folder, os.PathLike) if isinstance(folder, os.PathLike)
else os.path.join(self.root_path, folder) else os.path.join(self.root_path, folder)
for folder in self.template_folder for folder in self.template_folder
]) ]
)
def _method_route( def _method_route(
self, self,