root
/
flask
mirror of https://github.com/pallets/flask.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4350 from olliemath/patch-1 

Only use a custom JSONDecoder if needed
This commit is contained in:
David Lord 2021-12-22 17:10:24 -08:00 committed by GitHub
parent c5ca175004 a841cfabb5
commit 7b0c82dfdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -12,6 +12,9 @@ Unreleased
- Fix type annotation for ``errorhandler`` decorator. :issue:`4295` - Fix type annotation for ``errorhandler`` decorator. :issue:`4295`
- Revert a change to the CLI that caused it to hide ``ImportError`` - Revert a change to the CLI that caused it to hide ``ImportError``
tracebacks when importing the application. :issue:`4307` tracebacks when importing the application. :issue:`4307`
- ``app.json_encoder`` and ``json_decoder`` are only passed to
``dumps`` and ``loads`` if they have custom behavior. This improves
performance, mainly on PyPy. :issue:`4349`
Version 2.0.2 Version 2.0.2

12
src/flask/json/__init__.py
View File

@ -81,6 +81,11 @@ def _dump_arg_defaults(
if bp is not None and bp.json_encoder is not None: if bp is not None and bp.json_encoder is not None:
cls = bp.json_encoder cls = bp.json_encoder
# Only set a custom encoder if it has custom behavior. This is
# faster on PyPy.
if cls is not _json.JSONEncoder:
kwargs.setdefault("cls", cls)
kwargs.setdefault("cls", cls) kwargs.setdefault("cls", cls)
kwargs.setdefault("ensure_ascii", app.config["JSON_AS_ASCII"]) kwargs.setdefault("ensure_ascii", app.config["JSON_AS_ASCII"])
kwargs.setdefault("sort_keys", app.config["JSON_SORT_KEYS"]) kwargs.setdefault("sort_keys", app.config["JSON_SORT_KEYS"])
@ -102,9 +107,10 @@ def _load_arg_defaults(
if bp is not None and bp.json_decoder is not None: if bp is not None and bp.json_decoder is not None:
cls = bp.json_decoder cls = bp.json_decoder
kwargs.setdefault("cls", cls) # Only set a custom decoder if it has custom behavior. This is
else: # faster on PyPy.
kwargs.setdefault("cls", JSONDecoder) if cls not in {JSONDecoder, _json.JSONDecoder}:
kwargs.setdefault("cls", cls)
def dumps(obj: t.Any, app: t.Optional["Flask"] = None, **kwargs: t.Any) -> str: def dumps(obj: t.Any, app: t.Optional["Flask"] = None, **kwargs: t.Any) -> str: