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

Merge remote-tracking branch 'origin/1.1.x'

Browse source
This commit is contained in:
Grey Li 2021-01-04 10:14:36 +08:00
commit 7d2ba3e1fc
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/flask/json/__init__.py
View file

@ -175,7 +175,7 @@ def loads(s, app=None, **kwargs):
:param s: JSON string to deserialize.
:param app: Use this app's config instead of the active app context
or defaults.
:param kwargs: Extra arguments passed to func:`json.dump`.
:param kwargs: Extra arguments passed to :func:`json.loads`.
.. versionchanged:: 2.0
``encoding`` is deprecated and will be removed in 2.1. The data