Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improve and fix some type annotations (#2536)

Browse Source
This commit is contained in:
monosans 2022-09-13 05:53:48 +00:00 committed by GitHub
parent c8df0aa2cb
commit e4999401ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sanic/app.py
View File

@ -458,9 +458,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta):
def blueprint( def blueprint(
self, self,
blueprint: Union[ blueprint: Union[Blueprint, Iterable[Blueprint], BlueprintGroup],
Blueprint, List[Blueprint], Tuple[Blueprint], BlueprintGroup
],
**options: Any, **options: Any,
): ):
"""Register a blueprint on the application. """Register a blueprint on the application.
@ -469,7 +467,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta):
:param options: option dictionary with blueprint defaults :param options: option dictionary with blueprint defaults
:return: Nothing :return: Nothing
""" """
if isinstance(blueprint, (list, tuple, BlueprintGroup)): if isinstance(blueprint, (Iterable, BlueprintGroup)):
for item in blueprint: for item in blueprint:
params = {**options} params = {**options}
if isinstance(blueprint, BlueprintGroup): if isinstance(blueprint, BlueprintGroup):

14
tests/test_cli.py
View File

@ -120,7 +120,7 @@ def test_error_with_path_as_instance_without_simple_arg():
), ),
), ),
) )
def test_tls_options(cmd: Tuple[str]): def test_tls_options(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd, "-p=9999", "--debug"] command = ["sanic", "fake.server.app", *cmd, "-p=9999", "--debug"]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
assert exitcode != 1 assert exitcode != 1
@ -141,7 +141,7 @@ def test_tls_options(cmd: Tuple[str]):
("--tls-strict-host",), ("--tls-strict-host",),
), ),
) )
def test_tls_wrong_options(cmd: Tuple[str]): def test_tls_wrong_options(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd, "-p=9999", "--debug"] command = ["sanic", "fake.server.app", *cmd, "-p=9999", "--debug"]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
assert exitcode == 1 assert exitcode == 1
@ -158,7 +158,7 @@ def test_tls_wrong_options(cmd: Tuple[str]):
("-H", "localhost", "-p", "9999"), ("-H", "localhost", "-p", "9999"),
), ),
) )
def test_host_port_localhost(cmd: Tuple[str]): def test_host_port_localhost(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd] command = ["sanic", "fake.server.app", *cmd]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
lines = out.split(b"\n") lines = out.split(b"\n")
@ -175,7 +175,7 @@ def test_host_port_localhost(cmd: Tuple[str]):
("-H", "127.0.0.127", "-p", "9999"), ("-H", "127.0.0.127", "-p", "9999"),
), ),
) )
def test_host_port_ipv4(cmd: Tuple[str]): def test_host_port_ipv4(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd] command = ["sanic", "fake.server.app", *cmd]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
lines = out.split(b"\n") lines = out.split(b"\n")
@ -192,7 +192,7 @@ def test_host_port_ipv4(cmd: Tuple[str]):
("-H", "::", "-p", "9999"), ("-H", "::", "-p", "9999"),
), ),
) )
def test_host_port_ipv6_any(cmd: Tuple[str]): def test_host_port_ipv6_any(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd] command = ["sanic", "fake.server.app", *cmd]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
lines = out.split(b"\n") lines = out.split(b"\n")
@ -209,7 +209,7 @@ def test_host_port_ipv6_any(cmd: Tuple[str]):
("-H", "::1", "-p", "9999"), ("-H", "::1", "-p", "9999"),
), ),
) )
def test_host_port_ipv6_loopback(cmd: Tuple[str]): def test_host_port_ipv6_loopback(cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd] command = ["sanic", "fake.server.app", *cmd]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
lines = out.split(b"\n") lines = out.split(b"\n")
@ -230,7 +230,7 @@ def test_host_port_ipv6_loopback(cmd: Tuple[str]):
(4, ("-w", "4")), (4, ("-w", "4")),
), ),
) )
def test_num_workers(num: int, cmd: Tuple[str]): def test_num_workers(num: int, cmd: Tuple[str, ...]):
command = ["sanic", "fake.server.app", *cmd] command = ["sanic", "fake.server.app", *cmd]
out, err, exitcode = capture(command) out, err, exitcode = capture(command)
lines = out.split(b"\n") lines = out.split(b"\n")