mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
style: use Black everywhere (#2594)
* style: use Black everywhere * style: minor touchup from review
This commit is contained in:
@@ -15,11 +15,17 @@ def test_function_signatures(doc):
|
||||
assert doc(m.kw_func_udl) == "kw_func_udl(x: int, y: int = 300) -> str"
|
||||
assert doc(m.kw_func_udl_z) == "kw_func_udl_z(x: int, y: int = 0) -> str"
|
||||
assert doc(m.args_function) == "args_function(*args) -> tuple"
|
||||
assert doc(m.args_kwargs_function) == "args_kwargs_function(*args, **kwargs) -> tuple"
|
||||
assert doc(m.KWClass.foo0) == \
|
||||
"foo0(self: m.kwargs_and_defaults.KWClass, arg0: int, arg1: float) -> None"
|
||||
assert doc(m.KWClass.foo1) == \
|
||||
"foo1(self: m.kwargs_and_defaults.KWClass, x: int, y: float) -> None"
|
||||
assert (
|
||||
doc(m.args_kwargs_function) == "args_kwargs_function(*args, **kwargs) -> tuple"
|
||||
)
|
||||
assert (
|
||||
doc(m.KWClass.foo0)
|
||||
== "foo0(self: m.kwargs_and_defaults.KWClass, arg0: int, arg1: float) -> None"
|
||||
)
|
||||
assert (
|
||||
doc(m.KWClass.foo1)
|
||||
== "foo1(self: m.kwargs_and_defaults.KWClass, x: int, y: float) -> None"
|
||||
)
|
||||
|
||||
|
||||
def test_named_arguments(msg):
|
||||
@@ -40,7 +46,9 @@ def test_named_arguments(msg):
|
||||
# noinspection PyArgumentList
|
||||
m.kw_func2(x=5, y=10, z=12)
|
||||
assert excinfo.match(
|
||||
r'(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))' + '{3}$')
|
||||
r"(?s)^kw_func2\(\): incompatible.*Invoked with: kwargs: ((x=5|y=10|z=12)(, |$))"
|
||||
+ "{3}$"
|
||||
)
|
||||
|
||||
assert m.kw_func4() == "{13 17}"
|
||||
assert m.kw_func4(myList=[1, 2, 3]) == "{1 2 3}"
|
||||
@@ -50,11 +58,11 @@ def test_named_arguments(msg):
|
||||
|
||||
|
||||
def test_arg_and_kwargs():
|
||||
args = 'arg1_value', 'arg2_value', 3
|
||||
args = "arg1_value", "arg2_value", 3
|
||||
assert m.args_function(*args) == args
|
||||
|
||||
args = 'a1', 'a2'
|
||||
kwargs = dict(arg3='a3', arg4=4)
|
||||
args = "a1", "a2"
|
||||
kwargs = dict(arg3="a3", arg4=4)
|
||||
assert m.args_kwargs_function(*args, **kwargs) == (args, kwargs)
|
||||
|
||||
|
||||
@@ -68,47 +76,71 @@ def test_mixed_args_and_kwargs(msg):
|
||||
assert mpa(1, 2.5) == (1, 2.5, ())
|
||||
with pytest.raises(TypeError) as excinfo:
|
||||
assert mpa(1)
|
||||
assert msg(excinfo.value) == """
|
||||
assert (
|
||||
msg(excinfo.value)
|
||||
== """
|
||||
mixed_plus_args(): incompatible function arguments. The following argument types are supported:
|
||||
1. (arg0: int, arg1: float, *args) -> tuple
|
||||
|
||||
Invoked with: 1
|
||||
""" # noqa: E501 line too long
|
||||
)
|
||||
with pytest.raises(TypeError) as excinfo:
|
||||
assert mpa()
|
||||
assert msg(excinfo.value) == """
|
||||
assert (
|
||||
msg(excinfo.value)
|
||||
== """
|
||||
mixed_plus_args(): incompatible function arguments. The following argument types are supported:
|
||||
1. (arg0: int, arg1: float, *args) -> tuple
|
||||
|
||||
Invoked with:
|
||||
""" # noqa: E501 line too long
|
||||
)
|
||||
|
||||
assert mpk(-2, 3.5, pi=3.14159, e=2.71828) == (-2, 3.5, {'e': 2.71828, 'pi': 3.14159})
|
||||
assert mpk(-2, 3.5, pi=3.14159, e=2.71828) == (
|
||||
-2,
|
||||
3.5,
|
||||
{"e": 2.71828, "pi": 3.14159},
|
||||
)
|
||||
assert mpak(7, 7.7, 7.77, 7.777, 7.7777, minusseven=-7) == (
|
||||
7, 7.7, (7.77, 7.777, 7.7777), {'minusseven': -7})
|
||||
7,
|
||||
7.7,
|
||||
(7.77, 7.777, 7.7777),
|
||||
{"minusseven": -7},
|
||||
)
|
||||
assert mpakd() == (1, 3.14159, (), {})
|
||||
assert mpakd(3) == (3, 3.14159, (), {})
|
||||
assert mpakd(j=2.71828) == (1, 2.71828, (), {})
|
||||
assert mpakd(k=42) == (1, 3.14159, (), {'k': 42})
|
||||
assert mpakd(k=42) == (1, 3.14159, (), {"k": 42})
|
||||
assert mpakd(1, 1, 2, 3, 5, 8, then=13, followedby=21) == (
|
||||
1, 1, (2, 3, 5, 8), {'then': 13, 'followedby': 21})
|
||||
1,
|
||||
1,
|
||||
(2, 3, 5, 8),
|
||||
{"then": 13, "followedby": 21},
|
||||
)
|
||||
# Arguments specified both positionally and via kwargs should fail:
|
||||
with pytest.raises(TypeError) as excinfo:
|
||||
assert mpakd(1, i=1)
|
||||
assert msg(excinfo.value) == """
|
||||
assert (
|
||||
msg(excinfo.value)
|
||||
== """
|
||||
mixed_plus_args_kwargs_defaults(): incompatible function arguments. The following argument types are supported:
|
||||
1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
|
||||
|
||||
Invoked with: 1; kwargs: i=1
|
||||
""" # noqa: E501 line too long
|
||||
)
|
||||
with pytest.raises(TypeError) as excinfo:
|
||||
assert mpakd(1, 2, j=1)
|
||||
assert msg(excinfo.value) == """
|
||||
assert (
|
||||
msg(excinfo.value)
|
||||
== """
|
||||
mixed_plus_args_kwargs_defaults(): incompatible function arguments. The following argument types are supported:
|
||||
1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
|
||||
|
||||
Invoked with: 1, 2; kwargs: j=1
|
||||
""" # noqa: E501 line too long
|
||||
)
|
||||
|
||||
|
||||
def test_keyword_only_args(msg):
|
||||
@@ -134,9 +166,9 @@ def test_keyword_only_args(msg):
|
||||
assert m.kw_only_mixed(j=2, i=3) == (3, 2)
|
||||
assert m.kw_only_mixed(i=2, j=3) == (2, 3)
|
||||
|
||||
assert m.kw_only_plus_more(4, 5, k=6, extra=7) == (4, 5, 6, {'extra': 7})
|
||||
assert m.kw_only_plus_more(3, k=5, j=4, extra=6) == (3, 4, 5, {'extra': 6})
|
||||
assert m.kw_only_plus_more(2, k=3, extra=4) == (2, -1, 3, {'extra': 4})
|
||||
assert m.kw_only_plus_more(4, 5, k=6, extra=7) == (4, 5, 6, {"extra": 7})
|
||||
assert m.kw_only_plus_more(3, k=5, j=4, extra=6) == (3, 4, 5, {"extra": 6})
|
||||
assert m.kw_only_plus_more(2, k=3, extra=4) == (2, -1, 3, {"extra": 4})
|
||||
|
||||
with pytest.raises(TypeError) as excinfo:
|
||||
assert m.kw_only_mixed(i=1) == (1,)
|
||||
@@ -144,9 +176,12 @@ def test_keyword_only_args(msg):
|
||||
|
||||
with pytest.raises(RuntimeError) as excinfo:
|
||||
m.register_invalid_kw_only(m)
|
||||
assert msg(excinfo.value) == """
|
||||
assert (
|
||||
msg(excinfo.value)
|
||||
== """
|
||||
arg(): cannot specify an unnamed argument after an kw_only() annotation
|
||||
"""
|
||||
)
|
||||
|
||||
|
||||
def test_positional_only_args(msg):
|
||||
@@ -194,7 +229,10 @@ def test_signatures():
|
||||
assert "kw_only_mixed(i: int, *, j: int) -> tuple\n" == m.kw_only_mixed.__doc__
|
||||
assert "pos_only_all(i: int, j: int, /) -> tuple\n" == m.pos_only_all.__doc__
|
||||
assert "pos_only_mix(i: int, /, j: int) -> tuple\n" == m.pos_only_mix.__doc__
|
||||
assert "pos_kw_only_mix(i: int, /, j: int, *, k: int) -> tuple\n" == m.pos_kw_only_mix.__doc__
|
||||
assert (
|
||||
"pos_kw_only_mix(i: int, /, j: int, *, k: int) -> tuple\n"
|
||||
== m.pos_kw_only_mix.__doc__
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.xfail("env.PYPY and env.PY2", reason="PyPy2 doesn't double count")
|
||||
@@ -219,11 +257,18 @@ def test_args_refcount():
|
||||
assert m.args_function(-1, myval) == (-1, myval)
|
||||
assert refcount(myval) == expected
|
||||
|
||||
assert m.mixed_plus_args_kwargs(5, 6.0, myval, a=myval) == (5, 6.0, (myval,), {"a": myval})
|
||||
assert m.mixed_plus_args_kwargs(5, 6.0, myval, a=myval) == (
|
||||
5,
|
||||
6.0,
|
||||
(myval,),
|
||||
{"a": myval},
|
||||
)
|
||||
assert refcount(myval) == expected
|
||||
|
||||
assert m.args_kwargs_function(7, 8, myval, a=1, b=myval) == \
|
||||
((7, 8, myval), {"a": 1, "b": myval})
|
||||
assert m.args_kwargs_function(7, 8, myval, a=1, b=myval) == (
|
||||
(7, 8, myval),
|
||||
{"a": 1, "b": myval},
|
||||
)
|
||||
assert refcount(myval) == expected
|
||||
|
||||
exp3 = refcount(myval, myval, myval)
|
||||
|
||||
Reference in New Issue
Block a user