Merge branch '2.2.x'

This commit is contained in:
David Lord 2022-11-25 07:51:37 -08:00
commit 066a35dd32
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
13 changed files with 86 additions and 93 deletions

View file

@ -384,7 +384,7 @@ class Flask(Scaffold):
_json_decoder: t.Union[t.Type[json.JSONDecoder], None] = None
@property # type: ignore[override]
def json_encoder(self) -> t.Type[json.JSONEncoder]: # type: ignore[override]
def json_encoder(self) -> t.Type[json.JSONEncoder]:
"""The JSON encoder class to use. Defaults to
:class:`~flask.json.JSONEncoder`.
@ -423,7 +423,7 @@ class Flask(Scaffold):
self._json_encoder = value
@property # type: ignore[override]
def json_decoder(self) -> t.Type[json.JSONDecoder]: # type: ignore[override]
def json_decoder(self) -> t.Type[json.JSONDecoder]:
"""The JSON decoder class to use. Defaults to
:class:`~flask.json.JSONDecoder`.