From 09112cfc477a270f4b2990e1daf39db1dbe30e98 Mon Sep 17 00:00:00 2001 From: "Maxim G. Ivanov" Date: Fri, 23 Dec 2022 00:19:18 +0700 Subject: [PATCH] template_folder type allows pathlib --- CHANGES.rst | 2 ++ src/flask/app.py | 2 +- src/flask/blueprints.py | 2 +- src/flask/scaffold.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 94257a8b..fa1a6269 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,8 @@ Version 2.2.3 Unreleased +- Fix the type of ``template_folder`` to accept ``pathlib.Path``. :issue:`4892` + Version 2.2.2 ------------- diff --git a/src/flask/app.py b/src/flask/app.py index fed76e30..5315b71c 100644 --- a/src/flask/app.py +++ b/src/flask/app.py @@ -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, diff --git a/src/flask/blueprints.py b/src/flask/blueprints.py index c2595512..f6d62ba8 100644 --- a/src/flask/blueprints.py +++ b/src/flask/blueprints.py @@ -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, diff --git a/src/flask/scaffold.py b/src/flask/scaffold.py index 1530a11e..ebfc741f 100644 --- a/src/flask/scaffold.py +++ b/src/flask/scaffold.py @@ -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