maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch '2.2.x'

Browse source
This commit is contained in:
David Lord 2022-12-24 11:21:59 -07:00
commit 7464e17c5e
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
16 changed files with 41 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/flask/app.py
View file

@ -558,7 +558,7 @@ class Flask(Scaffold):
static_host: t.Optional[str] = None,
host_matching: bool = False,
subdomain_matching: bool = False,
template_folder: t.Optional[str] = "templates",
template_folder: t.Optional[t.Union[str, os.PathLike]] = "templates",
instance_path: t.Optional[str] = None,
instance_relative_config: bool = False,
root_path: t.Optional[str] = None,

2
src/flask/blueprints.py
View file

@ -250,7 +250,7 @@ class Blueprint(Scaffold):
import_name: str,
static_folder: t.Optional[t.Union[str, os.PathLike]] = None,
static_url_path: t.Optional[str] = None,
template_folder: t.Optional[str] = None,
template_folder: t.Optional[t.Union[str, os.PathLike]] = None,
url_prefix: t.Optional[str] = None,
subdomain: t.Optional[str] = None,
url_defaults: t.Optional[dict] = None,

2
src/flask/scaffold.py
View file

@ -93,7 +93,7 @@ class Scaffold:
import_name: str,
static_folder: t.Optional[t.Union[str, os.PathLike]] = None,
static_url_path: t.Optional[str] = None,
template_folder: t.Optional[str] = None,
template_folder: t.Optional[t.Union[str, os.PathLike]] = None,
root_path: t.Optional[str] = None,
):
#: The name of the package or module that this object belongs