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

Merge branch '2.1.x'

Browse source
This commit is contained in:
David Lord 2022-04-24 10:14:53 -07:00
commit cb4f742543
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
5 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/flask/cli.py
View file

@ -763,7 +763,10 @@ class SeparatedPathType(click.Path):
@click.option("--host", "-h", default="127.0.0.1", help="The interface to bind to.")
@click.option("--port", "-p", default=5000, help="The port to bind to.")
@click.option(
"--cert", type=CertParamType(), help="Specify a certificate file to use HTTPS."
"--cert",
type=CertParamType(),
help="Specify a certificate file to use HTTPS.",
is_eager=True,
)
@click.option(
"--key",

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

@ -153,7 +153,11 @@ def dump(
_json.dump(obj, fp, **kwargs)
def loads(s: str, app: t.Optional["Flask"] = None, **kwargs: t.Any) -> t.Any:
def loads(
s: t.Union[str, bytes],
app: t.Optional["Flask"] = None,
**kwargs: t.Any,
) -> t.Any:
"""Deserialize an object from a string of JSON.
Takes the same arguments as the built-in :func:`json.loads`, with