Commit c50f90ec by Henry Schreiner Committed by GitHub

style: use Black everywhere (#2594)

* style: use Black everywhere

* style: minor touchup from review
parent 2e31e466
...@@ -36,8 +36,7 @@ repos: ...@@ -36,8 +36,7 @@ repos:
- id: black - id: black
# By default, this ignores pyi files, though black supports them # By default, this ignores pyi files, though black supports them
types: [text] types: [text]
# Not all Python files are Blacked, yet files: \.pyi?$
files: ^(setup.py|pybind11|tests/extra|tools).*\.pyi?$
# Changes tabs to spaces # Changes tabs to spaces
- repo: https://github.com/Lucas-C/pre-commit-hooks - repo: https://github.com/Lucas-C/pre-commit-hooks
......
...@@ -14,7 +14,7 @@ def generate_dummy_code_pybind11(nclasses=10): ...@@ -14,7 +14,7 @@ def generate_dummy_code_pybind11(nclasses=10):
for cl in range(nclasses): for cl in range(nclasses):
decl += "class cl%03i;\n" % cl decl += "class cl%03i;\n" % cl
decl += '\n' decl += "\n"
for cl in range(nclasses): for cl in range(nclasses):
decl += "class cl%03i {\n" % cl decl += "class cl%03i {\n" % cl
...@@ -22,18 +22,17 @@ def generate_dummy_code_pybind11(nclasses=10): ...@@ -22,18 +22,17 @@ def generate_dummy_code_pybind11(nclasses=10):
bindings += ' py::class_<cl%03i>(m, "cl%03i")\n' % (cl, cl) bindings += ' py::class_<cl%03i>(m, "cl%03i")\n' % (cl, cl)
for fn in range(nfns): for fn in range(nfns):
ret = random.randint(0, nclasses - 1) ret = random.randint(0, nclasses - 1)
params = [random.randint(0, nclasses - 1) for i in range(nargs)] params = [random.randint(0, nclasses - 1) for i in range(nargs)]
decl += " cl%03i *fn_%03i(" % (ret, fn) decl += " cl%03i *fn_%03i(" % (ret, fn)
decl += ", ".join("cl%03i *" % p for p in params) decl += ", ".join("cl%03i *" % p for p in params)
decl += ");\n" decl += ");\n"
bindings += ' .def("fn_%03i", &cl%03i::fn_%03i)\n' % \ bindings += ' .def("fn_%03i", &cl%03i::fn_%03i)\n' % (fn, cl, fn)
(fn, cl, fn)
decl += "};\n\n" decl += "};\n\n"
bindings += ' ;\n' bindings += " ;\n"
result = "#include <pybind11/pybind11.h>\n\n" result = "#include <pybind11/pybind11.h>\n\n"
result += "namespace py = pybind11;\n\n" result += "namespace py = pybind11;\n\n"
result += decl + '\n' result += decl + "\n"
result += "PYBIND11_MODULE(example, m) {\n" result += "PYBIND11_MODULE(example, m) {\n"
result += bindings result += bindings
result += "}" result += "}"
...@@ -46,7 +45,7 @@ def generate_dummy_code_boost(nclasses=10): ...@@ -46,7 +45,7 @@ def generate_dummy_code_boost(nclasses=10):
for cl in range(nclasses): for cl in range(nclasses):
decl += "class cl%03i;\n" % cl decl += "class cl%03i;\n" % cl
decl += '\n' decl += "\n"
for cl in range(nclasses): for cl in range(nclasses):
decl += "class cl%03i {\n" % cl decl += "class cl%03i {\n" % cl
...@@ -54,18 +53,20 @@ def generate_dummy_code_boost(nclasses=10): ...@@ -54,18 +53,20 @@ def generate_dummy_code_boost(nclasses=10):
bindings += ' py::class_<cl%03i>("cl%03i")\n' % (cl, cl) bindings += ' py::class_<cl%03i>("cl%03i")\n' % (cl, cl)
for fn in range(nfns): for fn in range(nfns):
ret = random.randint(0, nclasses - 1) ret = random.randint(0, nclasses - 1)
params = [random.randint(0, nclasses - 1) for i in range(nargs)] params = [random.randint(0, nclasses - 1) for i in range(nargs)]
decl += " cl%03i *fn_%03i(" % (ret, fn) decl += " cl%03i *fn_%03i(" % (ret, fn)
decl += ", ".join("cl%03i *" % p for p in params) decl += ", ".join("cl%03i *" % p for p in params)
decl += ");\n" decl += ");\n"
bindings += ' .def("fn_%03i", &cl%03i::fn_%03i, py::return_value_policy<py::manage_new_object>())\n' % \ bindings += (
(fn, cl, fn) ' .def("fn_%03i", &cl%03i::fn_%03i, py::return_value_policy<py::manage_new_object>())\n'
% (fn, cl, fn)
)
decl += "};\n\n" decl += "};\n\n"
bindings += ' ;\n' bindings += " ;\n"
result = "#include <boost/python.hpp>\n\n" result = "#include <boost/python.hpp>\n\n"
result += "namespace py = boost::python;\n\n" result += "namespace py = boost::python;\n\n"
result += decl + '\n' result += decl + "\n"
result += "BOOST_PYTHON_MODULE(example) {\n" result += "BOOST_PYTHON_MODULE(example) {\n"
result += bindings result += bindings
result += "}" result += "}"
...@@ -73,17 +74,19 @@ def generate_dummy_code_boost(nclasses=10): ...@@ -73,17 +74,19 @@ def generate_dummy_code_boost(nclasses=10):
for codegen in [generate_dummy_code_pybind11, generate_dummy_code_boost]: for codegen in [generate_dummy_code_pybind11, generate_dummy_code_boost]:
print ("{") print("{")
for i in range(0, 10): for i in range(0, 10):
nclasses = 2 ** i nclasses = 2 ** i
with open("test.cpp", "w") as f: with open("test.cpp", "w") as f:
f.write(codegen(nclasses)) f.write(codegen(nclasses))
n1 = dt.datetime.now() n1 = dt.datetime.now()
os.system("g++ -Os -shared -rdynamic -undefined dynamic_lookup " os.system(
"g++ -Os -shared -rdynamic -undefined dynamic_lookup "
"-fvisibility=hidden -std=c++14 test.cpp -I include " "-fvisibility=hidden -std=c++14 test.cpp -I include "
"-I /System/Library/Frameworks/Python.framework/Headers -o test.so") "-I /System/Library/Frameworks/Python.framework/Headers -o test.so"
)
n2 = dt.datetime.now() n2 = dt.datetime.now()
elapsed = (n2 - n1).total_seconds() elapsed = (n2 - n1).total_seconds()
size = os.stat('test.so').st_size size = os.stat("test.so").st_size
print(" {%i, %f, %i}," % (nclasses * nfns, elapsed, size)) print(" {%i, %f, %i}," % (nclasses * nfns, elapsed, size))
print ("}") print("}")
...@@ -18,9 +18,9 @@ import env ...@@ -18,9 +18,9 @@ import env
# Early diagnostic for failed imports # Early diagnostic for failed imports
import pybind11_tests # noqa: F401 import pybind11_tests # noqa: F401
_unicode_marker = re.compile(r'u(\'[^\']*\')') _unicode_marker = re.compile(r"u(\'[^\']*\')")
_long_marker = re.compile(r'([0-9])L') _long_marker = re.compile(r"([0-9])L")
_hexadecimal = re.compile(r'0x[0-9a-fA-F]+') _hexadecimal = re.compile(r"0x[0-9a-fA-F]+")
# Avoid collecting Python3 only files # Avoid collecting Python3 only files
collect_ignore = [] collect_ignore = []
...@@ -30,7 +30,7 @@ if env.PY2: ...@@ -30,7 +30,7 @@ if env.PY2:
def _strip_and_dedent(s): def _strip_and_dedent(s):
"""For triple-quote strings""" """For triple-quote strings"""
return textwrap.dedent(s.lstrip('\n').rstrip()) return textwrap.dedent(s.lstrip("\n").rstrip())
def _split_and_sort(s): def _split_and_sort(s):
...@@ -40,11 +40,14 @@ def _split_and_sort(s): ...@@ -40,11 +40,14 @@ def _split_and_sort(s):
def _make_explanation(a, b): def _make_explanation(a, b):
"""Explanation for a failed assert -- the a and b arguments are List[str]""" """Explanation for a failed assert -- the a and b arguments are List[str]"""
return ["--- actual / +++ expected"] + [line.strip('\n') for line in difflib.ndiff(a, b)] return ["--- actual / +++ expected"] + [
line.strip("\n") for line in difflib.ndiff(a, b)
]
class Output(object): class Output(object):
"""Basic output post-processing and comparison""" """Basic output post-processing and comparison"""
def __init__(self, string): def __init__(self, string):
self.string = string self.string = string
self.explanation = [] self.explanation = []
...@@ -54,7 +57,11 @@ class Output(object): ...@@ -54,7 +57,11 @@ class Output(object):
def __eq__(self, other): def __eq__(self, other):
# Ignore constructor/destructor output which is prefixed with "###" # Ignore constructor/destructor output which is prefixed with "###"
a = [line for line in self.string.strip().splitlines() if not line.startswith("###")] a = [
line
for line in self.string.strip().splitlines()
if not line.startswith("###")
]
b = _strip_and_dedent(other).splitlines() b = _strip_and_dedent(other).splitlines()
if a == b: if a == b:
return True return True
...@@ -65,6 +72,7 @@ class Output(object): ...@@ -65,6 +72,7 @@ class Output(object):
class Unordered(Output): class Unordered(Output):
"""Custom comparison for output without strict line ordering""" """Custom comparison for output without strict line ordering"""
def __eq__(self, other): def __eq__(self, other):
a = _split_and_sort(self.string) a = _split_and_sort(self.string)
b = _split_and_sort(other) b = _split_and_sort(other)
...@@ -175,7 +183,7 @@ def msg(): ...@@ -175,7 +183,7 @@ def msg():
# noinspection PyUnusedLocal # noinspection PyUnusedLocal
def pytest_assertrepr_compare(op, left, right): def pytest_assertrepr_compare(op, left, right):
"""Hook to insert custom failure explanation""" """Hook to insert custom failure explanation"""
if hasattr(left, 'explanation'): if hasattr(left, "explanation"):
return left.explanation return left.explanation
...@@ -189,8 +197,8 @@ def suppress(exception): ...@@ -189,8 +197,8 @@ def suppress(exception):
def gc_collect(): def gc_collect():
''' Run the garbage collector twice (needed when running """Run the garbage collector twice (needed when running
reference counting tests with PyPy) ''' reference counting tests with PyPy)"""
gc.collect() gc.collect()
gc.collect() gc.collect()
......
...@@ -46,8 +46,8 @@ def test_to_python(): ...@@ -46,8 +46,8 @@ def test_to_python():
mat[3, 2] = 7.0 mat[3, 2] = 7.0
assert mat[2, 3] == 4 assert mat[2, 3] == 4
assert mat[3, 2] == 7 assert mat[3, 2] == 7
assert struct.unpack_from('f', mat, (3 * 4 + 2) * 4) == (7, ) assert struct.unpack_from("f", mat, (3 * 4 + 2) * 4) == (7,)
assert struct.unpack_from('f', mat, (2 * 4 + 3) * 4) == (4, ) assert struct.unpack_from("f", mat, (2 * 4 + 3) * 4) == (4,)
mat2 = np.array(mat, copy=False) mat2 = np.array(mat, copy=False)
assert mat2.shape == (5, 4) assert mat2.shape == (5, 4)
...@@ -83,31 +83,31 @@ def test_pointer_to_member_fn(): ...@@ -83,31 +83,31 @@ def test_pointer_to_member_fn():
for cls in [m.Buffer, m.ConstBuffer, m.DerivedBuffer]: for cls in [m.Buffer, m.ConstBuffer, m.DerivedBuffer]:
buf = cls() buf = cls()
buf.value = 0x12345678 buf.value = 0x12345678
value = struct.unpack('i', bytearray(buf))[0] value = struct.unpack("i", bytearray(buf))[0]
assert value == 0x12345678 assert value == 0x12345678
def test_readonly_buffer(): def test_readonly_buffer():
buf = m.BufferReadOnly(0x64) buf = m.BufferReadOnly(0x64)
view = memoryview(buf) view = memoryview(buf)
assert view[0] == b'd' if env.PY2 else 0x64 assert view[0] == b"d" if env.PY2 else 0x64
assert view.readonly assert view.readonly
def test_selective_readonly_buffer(): def test_selective_readonly_buffer():
buf = m.BufferReadOnlySelect() buf = m.BufferReadOnlySelect()
memoryview(buf)[0] = b'd' if env.PY2 else 0x64 memoryview(buf)[0] = b"d" if env.PY2 else 0x64
assert buf.value == 0x64 assert buf.value == 0x64
io.BytesIO(b'A').readinto(buf) io.BytesIO(b"A").readinto(buf)
assert buf.value == ord(b'A') assert buf.value == ord(b"A")
buf.readonly = True buf.readonly = True
with pytest.raises(TypeError): with pytest.raises(TypeError):
memoryview(buf)[0] = b'\0' if env.PY2 else 0 memoryview(buf)[0] = b"\0" if env.PY2 else 0
with pytest.raises(TypeError): with pytest.raises(TypeError):
io.BytesIO(b'1').readinto(buf) io.BytesIO(b"1").readinto(buf)
def test_ctypes_array_1d(): def test_ctypes_array_1d():
......
...@@ -16,10 +16,13 @@ def test_keep_alive_argument(capture): ...@@ -16,10 +16,13 @@ def test_keep_alive_argument(capture):
with capture: with capture:
p.addChild(m.Child()) p.addChild(m.Child())
assert ConstructorStats.detail_reg_inst() == n_inst + 1 assert ConstructorStats.detail_reg_inst() == n_inst + 1
assert capture == """ assert (
capture
== """
Allocating child. Allocating child.
Releasing child. Releasing child.
""" """
)
with capture: with capture:
del p del p
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
...@@ -35,10 +38,13 @@ def test_keep_alive_argument(capture): ...@@ -35,10 +38,13 @@ def test_keep_alive_argument(capture):
with capture: with capture:
del p del p
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
""" """
)
def test_keep_alive_return_value(capture): def test_keep_alive_return_value(capture):
...@@ -49,10 +55,13 @@ def test_keep_alive_return_value(capture): ...@@ -49,10 +55,13 @@ def test_keep_alive_return_value(capture):
with capture: with capture:
p.returnChild() p.returnChild()
assert ConstructorStats.detail_reg_inst() == n_inst + 1 assert ConstructorStats.detail_reg_inst() == n_inst + 1
assert capture == """ assert (
capture
== """
Allocating child. Allocating child.
Releasing child. Releasing child.
""" """
)
with capture: with capture:
del p del p
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
...@@ -68,10 +77,13 @@ def test_keep_alive_return_value(capture): ...@@ -68,10 +77,13 @@ def test_keep_alive_return_value(capture):
with capture: with capture:
del p del p
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
""" """
)
# https://foss.heptapod.net/pypy/pypy/-/issues/2447 # https://foss.heptapod.net/pypy/pypy/-/issues/2447
...@@ -82,14 +94,17 @@ def test_alive_gc(capture): ...@@ -82,14 +94,17 @@ def test_alive_gc(capture):
p.addChildKeepAlive(m.Child()) p.addChildKeepAlive(m.Child())
assert ConstructorStats.detail_reg_inst() == n_inst + 2 assert ConstructorStats.detail_reg_inst() == n_inst + 2
lst = [p] lst = [p]
lst.append(lst) # creates a circular reference lst.append(lst) # creates a circular reference
with capture: with capture:
del p, lst del p, lst
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
""" """
)
def test_alive_gc_derived(capture): def test_alive_gc_derived(capture):
...@@ -101,14 +116,17 @@ def test_alive_gc_derived(capture): ...@@ -101,14 +116,17 @@ def test_alive_gc_derived(capture):
p.addChildKeepAlive(m.Child()) p.addChildKeepAlive(m.Child())
assert ConstructorStats.detail_reg_inst() == n_inst + 2 assert ConstructorStats.detail_reg_inst() == n_inst + 2
lst = [p] lst = [p]
lst.append(lst) # creates a circular reference lst.append(lst) # creates a circular reference
with capture: with capture:
del p, lst del p, lst
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
""" """
)
def test_alive_gc_multi_derived(capture): def test_alive_gc_multi_derived(capture):
...@@ -123,15 +141,18 @@ def test_alive_gc_multi_derived(capture): ...@@ -123,15 +141,18 @@ def test_alive_gc_multi_derived(capture):
# +3 rather than +2 because Derived corresponds to two registered instances # +3 rather than +2 because Derived corresponds to two registered instances
assert ConstructorStats.detail_reg_inst() == n_inst + 3 assert ConstructorStats.detail_reg_inst() == n_inst + 3
lst = [p] lst = [p]
lst.append(lst) # creates a circular reference lst.append(lst) # creates a circular reference
with capture: with capture:
del p, lst del p, lst
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
Releasing child. Releasing child.
""" """
)
def test_return_none(capture): def test_return_none(capture):
...@@ -167,17 +188,23 @@ def test_keep_alive_constructor(capture): ...@@ -167,17 +188,23 @@ def test_keep_alive_constructor(capture):
with capture: with capture:
p = m.Parent(m.Child()) p = m.Parent(m.Child())
assert ConstructorStats.detail_reg_inst() == n_inst + 2 assert ConstructorStats.detail_reg_inst() == n_inst + 2
assert capture == """ assert (
capture
== """
Allocating child. Allocating child.
Allocating parent. Allocating parent.
""" """
)
with capture: with capture:
del p del p
assert ConstructorStats.detail_reg_inst() == n_inst assert ConstructorStats.detail_reg_inst() == n_inst
assert capture == """ assert (
capture
== """
Releasing parent. Releasing parent.
Releasing child. Releasing child.
""" """
)
def test_call_guard(): def test_call_guard():
......
...@@ -42,17 +42,19 @@ def test_bound_method_callback(): ...@@ -42,17 +42,19 @@ def test_bound_method_callback():
def test_keyword_args_and_generalized_unpacking(): def test_keyword_args_and_generalized_unpacking():
def f(*args, **kwargs): def f(*args, **kwargs):
return args, kwargs return args, kwargs
assert m.test_tuple_unpacking(f) == (("positional", 1, 2, 3, 4, 5, 6), {}) assert m.test_tuple_unpacking(f) == (("positional", 1, 2, 3, 4, 5, 6), {})
assert m.test_dict_unpacking(f) == (("positional", 1), {"key": "value", "a": 1, "b": 2}) assert m.test_dict_unpacking(f) == (
("positional", 1),
{"key": "value", "a": 1, "b": 2},
)
assert m.test_keyword_args(f) == ((), {"x": 10, "y": 20}) assert m.test_keyword_args(f) == ((), {"x": 10, "y": 20})
assert m.test_unpacking_and_keywords1(f) == ((1, 2), {"c": 3, "d": 4}) assert m.test_unpacking_and_keywords1(f) == ((1, 2), {"c": 3, "d": 4})
assert m.test_unpacking_and_keywords2(f) == ( assert m.test_unpacking_and_keywords2(f) == (
("positional", 1, 2, 3, 4, 5), ("positional", 1, 2, 3, 4, 5),
{"key": "value", "a": 1, "b": 2, "c": 3, "d": 4, "e": 5} {"key": "value", "a": 1, "b": 2, "c": 3, "d": 4, "e": 5},
) )
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
...@@ -83,12 +85,18 @@ def test_lambda_closure_cleanup(): ...@@ -83,12 +85,18 @@ def test_lambda_closure_cleanup():
def test_cpp_function_roundtrip(): def test_cpp_function_roundtrip():
"""Test if passing a function pointer from C++ -> Python -> C++ yields the original pointer""" """Test if passing a function pointer from C++ -> Python -> C++ yields the original pointer"""
assert m.test_dummy_function(m.dummy_function) == "matches dummy_function: eval(1) = 2" assert (
assert (m.test_dummy_function(m.roundtrip(m.dummy_function)) == m.test_dummy_function(m.dummy_function) == "matches dummy_function: eval(1) = 2"
"matches dummy_function: eval(1) = 2") )
assert (
m.test_dummy_function(m.roundtrip(m.dummy_function))
== "matches dummy_function: eval(1) = 2"
)
assert m.roundtrip(None, expect_none=True) is None assert m.roundtrip(None, expect_none=True) is None
assert (m.test_dummy_function(lambda x: x + 2) == assert (
"can't convert to function pointer: eval(1) = 3") m.test_dummy_function(lambda x: x + 2)
== "can't convert to function pointer: eval(1) = 3"
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.test_dummy_function(m.dummy_function2) m.test_dummy_function(m.dummy_function2)
...@@ -96,8 +104,10 @@ def test_cpp_function_roundtrip(): ...@@ -96,8 +104,10 @@ def test_cpp_function_roundtrip():
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.test_dummy_function(lambda x, y: x + y) m.test_dummy_function(lambda x, y: x + y)
assert any(s in str(excinfo.value) for s in ("missing 1 required positional argument", assert any(
"takes exactly 2 arguments")) s in str(excinfo.value)
for s in ("missing 1 required positional argument", "takes exactly 2 arguments")
)
def test_function_signatures(doc): def test_function_signatures(doc):
...@@ -127,6 +137,7 @@ def test_async_callbacks(): ...@@ -127,6 +137,7 @@ def test_async_callbacks():
m.test_async_callback(gen_f(), work) m.test_async_callback(gen_f(), work)
# wait until work is done # wait until work is done
from time import sleep from time import sleep
sleep(0.5) sleep(0.5)
assert sum(res) == sum([x + 3 for x in work]) assert sum(res) == sum([x + 3 for x in work])
......
...@@ -80,22 +80,28 @@ SKIP_TZ_ENV_ON_WIN = pytest.mark.skipif( ...@@ -80,22 +80,28 @@ SKIP_TZ_ENV_ON_WIN = pytest.mark.skipif(
) )
@pytest.mark.parametrize("time1", [ @pytest.mark.parametrize(
datetime.datetime.today().time(), "time1",
datetime.time(0, 0, 0), [
datetime.time(0, 0, 0, 1), datetime.datetime.today().time(),
datetime.time(0, 28, 45, 109827), datetime.time(0, 0, 0),
datetime.time(0, 59, 59, 999999), datetime.time(0, 0, 0, 1),
datetime.time(1, 0, 0), datetime.time(0, 28, 45, 109827),
datetime.time(5, 59, 59, 0), datetime.time(0, 59, 59, 999999),
datetime.time(5, 59, 59, 1), datetime.time(1, 0, 0),
]) datetime.time(5, 59, 59, 0),
@pytest.mark.parametrize("tz", [ datetime.time(5, 59, 59, 1),
None, ],
pytest.param("Europe/Brussels", marks=SKIP_TZ_ENV_ON_WIN), )
pytest.param("Asia/Pyongyang", marks=SKIP_TZ_ENV_ON_WIN), @pytest.mark.parametrize(
pytest.param("America/New_York", marks=SKIP_TZ_ENV_ON_WIN), "tz",
]) [
None,
pytest.param("Europe/Brussels", marks=SKIP_TZ_ENV_ON_WIN),
pytest.param("Asia/Pyongyang", marks=SKIP_TZ_ENV_ON_WIN),
pytest.param("America/New_York", marks=SKIP_TZ_ENV_ON_WIN),
],
)
def test_chrono_system_clock_roundtrip_time(time1, tz, monkeypatch): def test_chrono_system_clock_roundtrip_time(time1, tz, monkeypatch):
if tz is not None: if tz is not None:
monkeypatch.setenv("TZ", "/usr/share/zoneinfo/{}".format(tz)) monkeypatch.setenv("TZ", "/usr/share/zoneinfo/{}".format(tz))
...@@ -199,7 +205,7 @@ def test_floating_point_duration(): ...@@ -199,7 +205,7 @@ def test_floating_point_duration():
def test_nano_timepoint(): def test_nano_timepoint():
time = datetime.datetime.now() time = datetime.datetime.now()
time1 = m.test_nano_timepoint(time, datetime.timedelta(seconds=60)) time1 = m.test_nano_timepoint(time, datetime.timedelta(seconds=60))
assert(time1 == time + datetime.timedelta(seconds=60)) assert time1 == time + datetime.timedelta(seconds=60)
def test_chrono_different_resolutions(): def test_chrono_different_resolutions():
......
...@@ -31,8 +31,10 @@ def test_type(): ...@@ -31,8 +31,10 @@ def test_type():
with pytest.raises(RuntimeError) as execinfo: with pytest.raises(RuntimeError) as execinfo:
m.check_type(0) m.check_type(0)
assert 'pybind11::detail::get_type_info: unable to find type info' in str(execinfo.value) assert "pybind11::detail::get_type_info: unable to find type info" in str(
assert 'Invalid' in str(execinfo.value) execinfo.value
)
assert "Invalid" in str(execinfo.value)
# Currently not supported # Currently not supported
# See https://github.com/pybind/pybind11/issues/2486 # See https://github.com/pybind/pybind11/issues/2486
...@@ -73,18 +75,24 @@ def test_docstrings(doc): ...@@ -73,18 +75,24 @@ def test_docstrings(doc):
assert UserType.get_value.__name__ == "get_value" assert UserType.get_value.__name__ == "get_value"
assert UserType.get_value.__module__ == "pybind11_tests" assert UserType.get_value.__module__ == "pybind11_tests"
assert doc(UserType.get_value) == """ assert (
doc(UserType.get_value)
== """
get_value(self: m.UserType) -> int get_value(self: m.UserType) -> int
Get value using a method Get value using a method
""" """
)
assert doc(UserType.value) == "Get/set value using a property" assert doc(UserType.value) == "Get/set value using a property"
assert doc(m.NoConstructor.new_instance) == """ assert (
doc(m.NoConstructor.new_instance)
== """
new_instance() -> m.class_.NoConstructor new_instance() -> m.class_.NoConstructor
Return an instance Return an instance
""" """
)
def test_qualname(doc): def test_qualname(doc):
...@@ -93,51 +101,69 @@ def test_qualname(doc): ...@@ -93,51 +101,69 @@ def test_qualname(doc):
assert m.NestBase.__qualname__ == "NestBase" assert m.NestBase.__qualname__ == "NestBase"
assert m.NestBase.Nested.__qualname__ == "NestBase.Nested" assert m.NestBase.Nested.__qualname__ == "NestBase.Nested"
assert doc(m.NestBase.__init__) == """ assert (
doc(m.NestBase.__init__)
== """
__init__(self: m.class_.NestBase) -> None __init__(self: m.class_.NestBase) -> None
""" """
assert doc(m.NestBase.g) == """ )
assert (
doc(m.NestBase.g)
== """
g(self: m.class_.NestBase, arg0: m.class_.NestBase.Nested) -> None g(self: m.class_.NestBase, arg0: m.class_.NestBase.Nested) -> None
""" """
assert doc(m.NestBase.Nested.__init__) == """ )
assert (
doc(m.NestBase.Nested.__init__)
== """
__init__(self: m.class_.NestBase.Nested) -> None __init__(self: m.class_.NestBase.Nested) -> None
""" """
assert doc(m.NestBase.Nested.fn) == """ )
assert (
doc(m.NestBase.Nested.fn)
== """
fn(self: m.class_.NestBase.Nested, arg0: int, arg1: m.class_.NestBase, arg2: m.class_.NestBase.Nested) -> None fn(self: m.class_.NestBase.Nested, arg0: int, arg1: m.class_.NestBase, arg2: m.class_.NestBase.Nested) -> None
""" # noqa: E501 line too long """ # noqa: E501 line too long
assert doc(m.NestBase.Nested.fa) == """ )
assert (
doc(m.NestBase.Nested.fa)
== """
fa(self: m.class_.NestBase.Nested, a: int, b: m.class_.NestBase, c: m.class_.NestBase.Nested) -> None fa(self: m.class_.NestBase.Nested, a: int, b: m.class_.NestBase, c: m.class_.NestBase.Nested) -> None
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
assert m.NestBase.__module__ == "pybind11_tests.class_" assert m.NestBase.__module__ == "pybind11_tests.class_"
assert m.NestBase.Nested.__module__ == "pybind11_tests.class_" assert m.NestBase.Nested.__module__ == "pybind11_tests.class_"
def test_inheritance(msg): def test_inheritance(msg):
roger = m.Rabbit('Rabbit') roger = m.Rabbit("Rabbit")
assert roger.name() + " is a " + roger.species() == "Rabbit is a parrot" assert roger.name() + " is a " + roger.species() == "Rabbit is a parrot"
assert m.pet_name_species(roger) == "Rabbit is a parrot" assert m.pet_name_species(roger) == "Rabbit is a parrot"
polly = m.Pet('Polly', 'parrot') polly = m.Pet("Polly", "parrot")
assert polly.name() + " is a " + polly.species() == "Polly is a parrot" assert polly.name() + " is a " + polly.species() == "Polly is a parrot"
assert m.pet_name_species(polly) == "Polly is a parrot" assert m.pet_name_species(polly) == "Polly is a parrot"
molly = m.Dog('Molly') molly = m.Dog("Molly")
assert molly.name() + " is a " + molly.species() == "Molly is a dog" assert molly.name() + " is a " + molly.species() == "Molly is a dog"
assert m.pet_name_species(molly) == "Molly is a dog" assert m.pet_name_species(molly) == "Molly is a dog"
fred = m.Hamster('Fred') fred = m.Hamster("Fred")
assert fred.name() + " is a " + fred.species() == "Fred is a rodent" assert fred.name() + " is a " + fred.species() == "Fred is a rodent"
assert m.dog_bark(molly) == "Woof!" assert m.dog_bark(molly) == "Woof!"
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.dog_bark(polly) m.dog_bark(polly)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
dog_bark(): incompatible function arguments. The following argument types are supported: dog_bark(): incompatible function arguments. The following argument types are supported:
1. (arg0: m.class_.Dog) -> str 1. (arg0: m.class_.Dog) -> str
Invoked with: <m.class_.Pet object at 0> Invoked with: <m.class_.Pet object at 0>
""" """
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.Chimera("lion", "goat") m.Chimera("lion", "goat")
...@@ -150,6 +176,7 @@ def test_inheritance_init(msg): ...@@ -150,6 +176,7 @@ def test_inheritance_init(msg):
class Python(m.Pet): class Python(m.Pet):
def __init__(self): def __init__(self):
pass pass
with pytest.raises(TypeError) as exc_info: with pytest.raises(TypeError) as exc_info:
Python() Python()
expected = "m.class_.Pet.__init__() must be called when overriding __init__" expected = "m.class_.Pet.__init__() must be called when overriding __init__"
...@@ -191,13 +218,19 @@ def test_mismatched_holder(): ...@@ -191,13 +218,19 @@ def test_mismatched_holder():
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.mismatched_holder_1() m.mismatched_holder_1()
assert re.match('generic_type: type ".*MismatchDerived1" does not have a non-default ' assert re.match(
'holder type while its base ".*MismatchBase1" does', str(excinfo.value)) 'generic_type: type ".*MismatchDerived1" does not have a non-default '
'holder type while its base ".*MismatchBase1" does',
str(excinfo.value),
)
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.mismatched_holder_2() m.mismatched_holder_2()
assert re.match('generic_type: type ".*MismatchDerived2" has a non-default holder type ' assert re.match(
'while its base ".*MismatchBase2" does not', str(excinfo.value)) 'generic_type: type ".*MismatchDerived2" has a non-default holder type '
'while its base ".*MismatchBase2" does not',
str(excinfo.value),
)
def test_override_static(): def test_override_static():
...@@ -229,20 +262,20 @@ def test_operator_new_delete(capture): ...@@ -229,20 +262,20 @@ def test_operator_new_delete(capture):
a = m.HasOpNewDel() a = m.HasOpNewDel()
b = m.HasOpNewDelSize() b = m.HasOpNewDelSize()
d = m.HasOpNewDelBoth() d = m.HasOpNewDelBoth()
assert capture == """ assert (
capture
== """
A new 8 A new 8
B new 4 B new 4
D new 32 D new 32
""" """
)
sz_alias = str(m.AliasedHasOpNewDelSize.size_alias) sz_alias = str(m.AliasedHasOpNewDelSize.size_alias)
sz_noalias = str(m.AliasedHasOpNewDelSize.size_noalias) sz_noalias = str(m.AliasedHasOpNewDelSize.size_noalias)
with capture: with capture:
c = m.AliasedHasOpNewDelSize() c = m.AliasedHasOpNewDelSize()
c2 = SubAliased() c2 = SubAliased()
assert capture == ( assert capture == ("C new " + sz_noalias + "\n" + "C new " + sz_alias + "\n")
"C new " + sz_noalias + "\n" +
"C new " + sz_alias + "\n"
)
with capture: with capture:
del a del a
...@@ -251,21 +284,21 @@ def test_operator_new_delete(capture): ...@@ -251,21 +284,21 @@ def test_operator_new_delete(capture):
pytest.gc_collect() pytest.gc_collect()
del d del d
pytest.gc_collect() pytest.gc_collect()
assert capture == """ assert (
capture
== """
A delete A delete
B delete 4 B delete 4
D delete D delete
""" """
)
with capture: with capture:
del c del c
pytest.gc_collect() pytest.gc_collect()
del c2 del c2
pytest.gc_collect() pytest.gc_collect()
assert capture == ( assert capture == ("C delete " + sz_noalias + "\n" + "C delete " + sz_alias + "\n")
"C delete " + sz_noalias + "\n" +
"C delete " + sz_alias + "\n"
)
def test_bind_protected_functions(): def test_bind_protected_functions():
...@@ -325,19 +358,23 @@ def test_reentrant_implicit_conversion_failure(msg): ...@@ -325,19 +358,23 @@ def test_reentrant_implicit_conversion_failure(msg):
# ensure that there is no runaway reentrant implicit conversion (#1035) # ensure that there is no runaway reentrant implicit conversion (#1035)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.BogusImplicitConversion(0) m.BogusImplicitConversion(0)
assert msg(excinfo.value) == ''' assert (
msg(excinfo.value)
== """
__init__(): incompatible constructor arguments. The following argument types are supported: __init__(): incompatible constructor arguments. The following argument types are supported:
1. m.class_.BogusImplicitConversion(arg0: m.class_.BogusImplicitConversion) 1. m.class_.BogusImplicitConversion(arg0: m.class_.BogusImplicitConversion)
Invoked with: 0 Invoked with: 0
''' """
)
def test_error_after_conversions(): def test_error_after_conversions():
with pytest.raises(TypeError) as exc_info: with pytest.raises(TypeError) as exc_info:
m.test_error_after_conversions("hello") m.test_error_after_conversions("hello")
assert str(exc_info.value).startswith( assert str(exc_info.value).startswith(
"Unable to convert function return value to a Python type!") "Unable to convert function return value to a Python type!"
)
def test_aligned(): def test_aligned():
...@@ -350,8 +387,10 @@ def test_aligned(): ...@@ -350,8 +387,10 @@ def test_aligned():
@pytest.mark.xfail("env.PYPY") @pytest.mark.xfail("env.PYPY")
def test_final(): def test_final():
with pytest.raises(TypeError) as exc_info: with pytest.raises(TypeError) as exc_info:
class PyFinalChild(m.IsFinal): class PyFinalChild(m.IsFinal):
pass pass
assert str(exc_info.value).endswith("is not an acceptable base type") assert str(exc_info.value).endswith("is not an acceptable base type")
...@@ -359,8 +398,10 @@ def test_final(): ...@@ -359,8 +398,10 @@ def test_final():
@pytest.mark.xfail("env.PYPY") @pytest.mark.xfail("env.PYPY")
def test_non_final_final(): def test_non_final_final():
with pytest.raises(TypeError) as exc_info: with pytest.raises(TypeError) as exc_info:
class PyNonFinalFinalChild(m.IsNonFinalFinal): class PyNonFinalFinalChild(m.IsNonFinalFinal):
pass pass
assert str(exc_info.value).endswith("is not an acceptable base type") assert str(exc_info.value).endswith("is not an acceptable base type")
...@@ -396,11 +437,14 @@ def test_base_and_derived_nested_scope(): ...@@ -396,11 +437,14 @@ def test_base_and_derived_nested_scope():
@pytest.mark.skip("See https://github.com/pybind/pybind11/pull/2564") @pytest.mark.skip("See https://github.com/pybind/pybind11/pull/2564")
def test_register_duplicate_class(): def test_register_duplicate_class():
import types import types
module_scope = types.ModuleType("module_scope") module_scope = types.ModuleType("module_scope")
with pytest.raises(RuntimeError) as exc_info: with pytest.raises(RuntimeError) as exc_info:
m.register_duplicate_class_name(module_scope) m.register_duplicate_class_name(module_scope)
expected = ('generic_type: cannot initialize type "Duplicate": ' expected = (
'an object with that name is already defined') 'generic_type: cannot initialize type "Duplicate": '
"an object with that name is already defined"
)
assert str(exc_info.value) == expected assert str(exc_info.value) == expected
with pytest.raises(RuntimeError) as exc_info: with pytest.raises(RuntimeError) as exc_info:
m.register_duplicate_class_type(module_scope) m.register_duplicate_class_type(module_scope)
...@@ -409,10 +453,13 @@ def test_register_duplicate_class(): ...@@ -409,10 +453,13 @@ def test_register_duplicate_class():
class ClassScope: class ClassScope:
pass pass
with pytest.raises(RuntimeError) as exc_info: with pytest.raises(RuntimeError) as exc_info:
m.register_duplicate_nested_class_name(ClassScope) m.register_duplicate_nested_class_name(ClassScope)
expected = ('generic_type: cannot initialize type "DuplicateNested": ' expected = (
'an object with that name is already defined') 'generic_type: cannot initialize type "DuplicateNested": '
"an object with that name is already defined"
)
assert str(exc_info.value) == expected assert str(exc_info.value) == expected
with pytest.raises(RuntimeError) as exc_info: with pytest.raises(RuntimeError) as exc_info:
m.register_duplicate_nested_class_type(ClassScope) m.register_duplicate_nested_class_type(ClassScope)
......
...@@ -19,7 +19,11 @@ def test_move_and_copy_casts(): ...@@ -19,7 +19,11 @@ def test_move_and_copy_casts():
"""Cast some values in C++ via custom type casters and count the number of moves/copies.""" """Cast some values in C++ via custom type casters and count the number of moves/copies."""
cstats = m.move_and_copy_cstats() cstats = m.move_and_copy_cstats()
c_m, c_mc, c_c = cstats["MoveOnlyInt"], cstats["MoveOrCopyInt"], cstats["CopyOnlyInt"] c_m, c_mc, c_c = (
cstats["MoveOnlyInt"],
cstats["MoveOrCopyInt"],
cstats["CopyOnlyInt"],
)
# The type move constructions/assignments below each get incremented: the move assignment comes # The type move constructions/assignments below each get incremented: the move assignment comes
# from the type_caster load; the move construction happens when extracting that via a cast or # from the type_caster load; the move construction happens when extracting that via a cast or
...@@ -43,7 +47,11 @@ def test_move_and_copy_loads(): ...@@ -43,7 +47,11 @@ def test_move_and_copy_loads():
moves/copies.""" moves/copies."""
cstats = m.move_and_copy_cstats() cstats = m.move_and_copy_cstats()
c_m, c_mc, c_c = cstats["MoveOnlyInt"], cstats["MoveOrCopyInt"], cstats["CopyOnlyInt"] c_m, c_mc, c_c = (
cstats["MoveOnlyInt"],
cstats["MoveOrCopyInt"],
cstats["CopyOnlyInt"],
)
assert m.move_only(10) == 10 # 1 move, c_m assert m.move_only(10) == 10 # 1 move, c_m
assert m.move_or_copy(11) == 11 # 1 move, c_mc assert m.move_or_copy(11) == 11 # 1 move, c_mc
...@@ -66,12 +74,16 @@ def test_move_and_copy_loads(): ...@@ -66,12 +74,16 @@ def test_move_and_copy_loads():
assert c_m.alive() + c_mc.alive() + c_c.alive() == 0 assert c_m.alive() + c_mc.alive() + c_c.alive() == 0
@pytest.mark.skipif(not m.has_optional, reason='no <optional>') @pytest.mark.skipif(not m.has_optional, reason="no <optional>")
def test_move_and_copy_load_optional(): def test_move_and_copy_load_optional():
"""Tests move/copy loads of std::optional arguments""" """Tests move/copy loads of std::optional arguments"""
cstats = m.move_and_copy_cstats() cstats = m.move_and_copy_cstats()
c_m, c_mc, c_c = cstats["MoveOnlyInt"], cstats["MoveOrCopyInt"], cstats["CopyOnlyInt"] c_m, c_mc, c_c = (
cstats["MoveOnlyInt"],
cstats["MoveOrCopyInt"],
cstats["CopyOnlyInt"],
)
# The extra move/copy constructions below come from the std::optional move (which has to move # The extra move/copy constructions below come from the std::optional move (which has to move
# its arguments): # its arguments):
......
...@@ -5,65 +5,91 @@ from pybind11_tests import custom_type_casters as m ...@@ -5,65 +5,91 @@ from pybind11_tests import custom_type_casters as m
def test_noconvert_args(msg): def test_noconvert_args(msg):
a = m.ArgInspector() a = m.ArgInspector()
assert msg(a.f("hi")) == """ assert (
msg(a.f("hi"))
== """
loading ArgInspector1 argument WITH conversion allowed. Argument value = hi loading ArgInspector1 argument WITH conversion allowed. Argument value = hi
""" """
assert msg(a.g("this is a", "this is b")) == """ )
assert (
msg(a.g("this is a", "this is b"))
== """
loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
13 13
loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2) loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2)
""" # noqa: E501 line too long """ # noqa: E501 line too long
assert msg(a.g("this is a", "this is b", 42)) == """ )
assert (
msg(a.g("this is a", "this is b", 42))
== """
loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
42 42
loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2) loading ArgInspector2 argument WITH conversion allowed. Argument value = (default arg inspector 2)
""" # noqa: E501 line too long """ # noqa: E501 line too long
assert msg(a.g("this is a", "this is b", 42, "this is d")) == """ )
assert (
msg(a.g("this is a", "this is b", 42, "this is d"))
== """
loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = this is a
loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b loading ArgInspector1 argument WITH conversion allowed. Argument value = this is b
42 42
loading ArgInspector2 argument WITH conversion allowed. Argument value = this is d loading ArgInspector2 argument WITH conversion allowed. Argument value = this is d
""" """
assert (a.h("arg 1") == )
"loading ArgInspector2 argument WITHOUT conversion allowed. Argument value = arg 1") assert (
assert msg(m.arg_inspect_func("A1", "A2")) == """ a.h("arg 1")
== "loading ArgInspector2 argument WITHOUT conversion allowed. Argument value = arg 1"
)
assert (
msg(m.arg_inspect_func("A1", "A2"))
== """
loading ArgInspector2 argument WITH conversion allowed. Argument value = A1 loading ArgInspector2 argument WITH conversion allowed. Argument value = A1
loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = A2 loading ArgInspector1 argument WITHOUT conversion allowed. Argument value = A2
""" """
)
assert m.floats_preferred(4) == 2.0 assert m.floats_preferred(4) == 2.0
assert m.floats_only(4.0) == 2.0 assert m.floats_only(4.0) == 2.0
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.floats_only(4) m.floats_only(4)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
floats_only(): incompatible function arguments. The following argument types are supported: floats_only(): incompatible function arguments. The following argument types are supported:
1. (f: float) -> float 1. (f: float) -> float
Invoked with: 4 Invoked with: 4
""" """
)
assert m.ints_preferred(4) == 2 assert m.ints_preferred(4) == 2
assert m.ints_preferred(True) == 0 assert m.ints_preferred(True) == 0
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.ints_preferred(4.0) m.ints_preferred(4.0)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
ints_preferred(): incompatible function arguments. The following argument types are supported: ints_preferred(): incompatible function arguments. The following argument types are supported:
1. (i: int) -> int 1. (i: int) -> int
Invoked with: 4.0 Invoked with: 4.0
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
assert m.ints_only(4) == 2 assert m.ints_only(4) == 2
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.ints_only(4.0) m.ints_only(4.0)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
ints_only(): incompatible function arguments. The following argument types are supported: ints_only(): incompatible function arguments. The following argument types are supported:
1. (i: int) -> int 1. (i: int) -> int
Invoked with: 4.0 Invoked with: 4.0
""" """
)
def test_custom_caster_destruction(): def test_custom_caster_destruction():
......
...@@ -18,10 +18,10 @@ def test_docstring_options(): ...@@ -18,10 +18,10 @@ def test_docstring_options():
assert m.test_overloaded3.__doc__ == "Overload docstr" assert m.test_overloaded3.__doc__ == "Overload docstr"
# options.enable_function_signatures() # options.enable_function_signatures()
assert m.test_function3.__doc__ .startswith("test_function3(a: int, b: int) -> None") assert m.test_function3.__doc__.startswith("test_function3(a: int, b: int) -> None")
assert m.test_function4.__doc__ .startswith("test_function4(a: int, b: int) -> None") assert m.test_function4.__doc__.startswith("test_function4(a: int, b: int) -> None")
assert m.test_function4.__doc__ .endswith("A custom docstring\n") assert m.test_function4.__doc__.endswith("A custom docstring\n")
# options.disable_function_signatures() # options.disable_function_signatures()
# options.disable_user_defined_docstrings() # options.disable_user_defined_docstrings()
...@@ -31,8 +31,8 @@ def test_docstring_options(): ...@@ -31,8 +31,8 @@ def test_docstring_options():
assert m.test_function6.__doc__ == "A custom docstring" assert m.test_function6.__doc__ == "A custom docstring"
# RAII destructor # RAII destructor
assert m.test_function7.__doc__ .startswith("test_function7(a: int, b: int) -> None") assert m.test_function7.__doc__.startswith("test_function7(a: int, b: int) -> None")
assert m.test_function7.__doc__ .endswith("A custom docstring\n") assert m.test_function7.__doc__.endswith("A custom docstring\n")
# Suppression of user-defined docstrings for non-function objects # Suppression of user-defined docstrings for non-function objects
assert not m.DocstringTestFoo.__doc__ assert not m.DocstringTestFoo.__doc__
......
...@@ -24,18 +24,24 @@ def test_unscoped_enum(): ...@@ -24,18 +24,24 @@ def test_unscoped_enum():
assert m.UnscopedEnum.EOne.name == "EOne" assert m.UnscopedEnum.EOne.name == "EOne"
# __members__ property # __members__ property
assert m.UnscopedEnum.__members__ == \ assert m.UnscopedEnum.__members__ == {
{"EOne": m.UnscopedEnum.EOne, "ETwo": m.UnscopedEnum.ETwo, "EThree": m.UnscopedEnum.EThree} "EOne": m.UnscopedEnum.EOne,
"ETwo": m.UnscopedEnum.ETwo,
"EThree": m.UnscopedEnum.EThree,
}
# __members__ readonly # __members__ readonly
with pytest.raises(AttributeError): with pytest.raises(AttributeError):
m.UnscopedEnum.__members__ = {} m.UnscopedEnum.__members__ = {}
# __members__ returns a copy # __members__ returns a copy
foo = m.UnscopedEnum.__members__ foo = m.UnscopedEnum.__members__
foo["bar"] = "baz" foo["bar"] = "baz"
assert m.UnscopedEnum.__members__ == \ assert m.UnscopedEnum.__members__ == {
{"EOne": m.UnscopedEnum.EOne, "ETwo": m.UnscopedEnum.ETwo, "EThree": m.UnscopedEnum.EThree} "EOne": m.UnscopedEnum.EOne,
"ETwo": m.UnscopedEnum.ETwo,
"EThree": m.UnscopedEnum.EThree,
}
for docstring_line in '''An unscoped enumeration for docstring_line in """An unscoped enumeration
Members: Members:
...@@ -43,7 +49,9 @@ Members: ...@@ -43,7 +49,9 @@ Members:
ETwo : Docstring for ETwo ETwo : Docstring for ETwo
EThree : Docstring for EThree'''.split('\n'): EThree : Docstring for EThree""".split(
"\n"
):
assert docstring_line in m.UnscopedEnum.__doc__ assert docstring_line in m.UnscopedEnum.__doc__
# Unscoped enums will accept ==/!= int comparisons # Unscoped enums will accept ==/!= int comparisons
...@@ -53,10 +61,10 @@ Members: ...@@ -53,10 +61,10 @@ Members:
assert y != 3 assert y != 3
assert 3 != y assert 3 != y
# Compare with None # Compare with None
assert (y != None) # noqa: E711 assert y != None # noqa: E711
assert not (y == None) # noqa: E711 assert not (y == None) # noqa: E711
# Compare with an object # Compare with an object
assert (y != object()) assert y != object()
assert not (y == object()) assert not (y == object())
# Compare with string # Compare with string
assert y != "2" assert y != "2"
...@@ -119,10 +127,10 @@ def test_scoped_enum(): ...@@ -119,10 +127,10 @@ def test_scoped_enum():
assert z != 3 assert z != 3
assert 3 != z assert 3 != z
# Compare with None # Compare with None
assert (z != None) # noqa: E711 assert z != None # noqa: E711
assert not (z == None) # noqa: E711 assert not (z == None) # noqa: E711
# Compare with an object # Compare with an object
assert (z != object()) assert z != object()
assert not (z == object()) assert not (z == object())
# Scoped enums will *NOT* accept >, <, >= and <= int comparisons (Will throw exceptions) # Scoped enums will *NOT* accept >, <, >= and <= int comparisons (Will throw exceptions)
with pytest.raises(TypeError): with pytest.raises(TypeError):
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# This file is called from 'test_eval.py' # This file is called from 'test_eval.py'
if 'call_test2' in locals(): if "call_test2" in locals():
call_test2(y) # noqa: F821 undefined name call_test2(y) # noqa: F821 undefined name
...@@ -54,27 +54,27 @@ def test_python_alreadyset_in_destructor(monkeypatch, capsys): ...@@ -54,27 +54,27 @@ def test_python_alreadyset_in_destructor(monkeypatch, capsys):
hooked = False hooked = False
triggered = [False] # mutable, so Python 2.7 closure can modify it triggered = [False] # mutable, so Python 2.7 closure can modify it
if hasattr(sys, 'unraisablehook'): # Python 3.8+ if hasattr(sys, "unraisablehook"): # Python 3.8+
hooked = True hooked = True
default_hook = sys.unraisablehook default_hook = sys.unraisablehook
def hook(unraisable_hook_args): def hook(unraisable_hook_args):
exc_type, exc_value, exc_tb, err_msg, obj = unraisable_hook_args exc_type, exc_value, exc_tb, err_msg, obj = unraisable_hook_args
if obj == 'already_set demo': if obj == "already_set demo":
triggered[0] = True triggered[0] = True
default_hook(unraisable_hook_args) default_hook(unraisable_hook_args)
return return
# Use monkeypatch so pytest can apply and remove the patch as appropriate # Use monkeypatch so pytest can apply and remove the patch as appropriate
monkeypatch.setattr(sys, 'unraisablehook', hook) monkeypatch.setattr(sys, "unraisablehook", hook)
assert m.python_alreadyset_in_destructor('already_set demo') is True assert m.python_alreadyset_in_destructor("already_set demo") is True
if hooked: if hooked:
assert triggered[0] is True assert triggered[0] is True
_, captured_stderr = capsys.readouterr() _, captured_stderr = capsys.readouterr()
# Error message is different in Python 2 and 3, check for words that appear in both # Error message is different in Python 2 and 3, check for words that appear in both
assert 'ignored' in captured_stderr and 'already_set demo' in captured_stderr assert "ignored" in captured_stderr and "already_set demo" in captured_stderr
def test_exception_matches(): def test_exception_matches():
...@@ -107,7 +107,9 @@ def test_custom(msg): ...@@ -107,7 +107,9 @@ def test_custom(msg):
# Can we fall-through to the default handler? # Can we fall-through to the default handler?
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.throws_logic_error() m.throws_logic_error()
assert msg(excinfo.value) == "this error should fall through to the standard handler" assert (
msg(excinfo.value) == "this error should fall through to the standard handler"
)
# OverFlow error translation. # OverFlow error translation.
with pytest.raises(OverflowError) as excinfo: with pytest.raises(OverflowError) as excinfo:
...@@ -166,7 +168,13 @@ def test_nested_throws(capture): ...@@ -166,7 +168,13 @@ def test_nested_throws(capture):
# C++ -> Python -> C++ -> Python # C++ -> Python -> C++ -> Python
with capture: with capture:
m.try_catch( m.try_catch(
m.MyException5, pycatch, m.MyException, m.try_catch, m.MyException, throw_myex5) m.MyException5,
pycatch,
m.MyException,
m.try_catch,
m.MyException,
throw_myex5,
)
assert str(capture).startswith("MyException5: nested error 5") assert str(capture).startswith("MyException5: nested error 5")
# C++ -> Python -> C++ # C++ -> Python -> C++
...@@ -182,7 +190,6 @@ def test_nested_throws(capture): ...@@ -182,7 +190,6 @@ def test_nested_throws(capture):
# This can often happen if you wrap a pybind11 class in a Python wrapper # This can often happen if you wrap a pybind11 class in a Python wrapper
def test_invalid_repr(): def test_invalid_repr():
class MyRepr(object): class MyRepr(object):
def __repr__(self): def __repr__(self):
raise AttributeError("Example error") raise AttributeError("Example error")
......
...@@ -21,6 +21,7 @@ def _run_in_process(target, *args, **kwargs): ...@@ -21,6 +21,7 @@ def _run_in_process(target, *args, **kwargs):
def _python_to_cpp_to_python(): def _python_to_cpp_to_python():
"""Calls different C++ functions that come back to Python.""" """Calls different C++ functions that come back to Python."""
class ExtendedVirtClass(m.VirtClass): class ExtendedVirtClass(m.VirtClass):
def virtual_func(self): def virtual_func(self):
pass pass
...@@ -74,7 +75,9 @@ def test_python_to_cpp_to_python_from_thread_multiple_sequential(): ...@@ -74,7 +75,9 @@ def test_python_to_cpp_to_python_from_thread_multiple_sequential():
It runs in a separate process to be able to stop and assert if it deadlocks. It runs in a separate process to be able to stop and assert if it deadlocks.
""" """
assert _run_in_process(_python_to_cpp_to_python_from_threads, 8, parallel=False) == 0 assert (
_run_in_process(_python_to_cpp_to_python_from_threads, 8, parallel=False) == 0
)
# TODO: FIXME on macOS Python 3.9 # TODO: FIXME on macOS Python 3.9
......
...@@ -18,6 +18,7 @@ try: ...@@ -18,6 +18,7 @@ try:
# Python 3.4 # Python 3.4
from contextlib import redirect_stdout from contextlib import redirect_stdout
except ImportError: except ImportError:
@contextmanager @contextmanager
def redirect_stdout(target): def redirect_stdout(target):
original = sys.stdout original = sys.stdout
...@@ -25,10 +26,12 @@ except ImportError: ...@@ -25,10 +26,12 @@ except ImportError:
yield yield
sys.stdout = original sys.stdout = original
try: try:
# Python 3.5 # Python 3.5
from contextlib import redirect_stderr from contextlib import redirect_stderr
except ImportError: except ImportError:
@contextmanager @contextmanager
def redirect_stderr(target): def redirect_stderr(target):
original = sys.stderr original = sys.stderr
...@@ -42,16 +45,16 @@ def test_captured(capsys): ...@@ -42,16 +45,16 @@ def test_captured(capsys):
m.captured_output(msg) m.captured_output(msg)
stdout, stderr = capsys.readouterr() stdout, stderr = capsys.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
m.captured_output_default(msg) m.captured_output_default(msg)
stdout, stderr = capsys.readouterr() stdout, stderr = capsys.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
m.captured_err(msg) m.captured_err(msg)
stdout, stderr = capsys.readouterr() stdout, stderr = capsys.readouterr()
assert stdout == '' assert stdout == ""
assert stderr == msg assert stderr == msg
...@@ -63,7 +66,7 @@ def test_captured_large_string(capsys): ...@@ -63,7 +66,7 @@ def test_captured_large_string(capsys):
m.captured_output_default(msg) m.captured_output_default(msg)
stdout, stderr = capsys.readouterr() stdout, stderr = capsys.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
def test_guard_capture(capsys): def test_guard_capture(capsys):
...@@ -71,7 +74,7 @@ def test_guard_capture(capsys): ...@@ -71,7 +74,7 @@ def test_guard_capture(capsys):
m.guard_output(msg) m.guard_output(msg)
stdout, stderr = capsys.readouterr() stdout, stderr = capsys.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
def test_series_captured(capture): def test_series_captured(capture):
...@@ -88,7 +91,7 @@ def test_flush(capfd): ...@@ -88,7 +91,7 @@ def test_flush(capfd):
with m.ostream_redirect(): with m.ostream_redirect():
m.noisy_function(msg, flush=False) m.noisy_function(msg, flush=False)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
m.noisy_function(msg2, flush=True) m.noisy_function(msg2, flush=True)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
...@@ -107,15 +110,15 @@ def test_not_captured(capfd): ...@@ -107,15 +110,15 @@ def test_not_captured(capfd):
m.raw_output(msg) m.raw_output(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
assert stream.getvalue() == '' assert stream.getvalue() == ""
stream = StringIO() stream = StringIO()
with redirect_stdout(stream): with redirect_stdout(stream):
m.captured_output(msg) m.captured_output(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
assert stderr == '' assert stderr == ""
assert stream.getvalue() == msg assert stream.getvalue() == msg
...@@ -125,16 +128,16 @@ def test_err(capfd): ...@@ -125,16 +128,16 @@ def test_err(capfd):
with redirect_stderr(stream): with redirect_stderr(stream):
m.raw_err(msg) m.raw_err(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
assert stderr == msg assert stderr == msg
assert stream.getvalue() == '' assert stream.getvalue() == ""
stream = StringIO() stream = StringIO()
with redirect_stderr(stream): with redirect_stderr(stream):
m.captured_err(msg) m.captured_err(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
assert stderr == '' assert stderr == ""
assert stream.getvalue() == msg assert stream.getvalue() == msg
...@@ -146,8 +149,8 @@ def test_multi_captured(capfd): ...@@ -146,8 +149,8 @@ def test_multi_captured(capfd):
m.captured_output("c") m.captured_output("c")
m.raw_output("d") m.raw_output("d")
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == 'bd' assert stdout == "bd"
assert stream.getvalue() == 'ac' assert stream.getvalue() == "ac"
def test_dual(capsys): def test_dual(capsys):
...@@ -164,14 +167,14 @@ def test_redirect(capfd): ...@@ -164,14 +167,14 @@ def test_redirect(capfd):
m.raw_output(msg) m.raw_output(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == msg assert stdout == msg
assert stream.getvalue() == '' assert stream.getvalue() == ""
stream = StringIO() stream = StringIO()
with redirect_stdout(stream): with redirect_stdout(stream):
with m.ostream_redirect(): with m.ostream_redirect():
m.raw_output(msg) m.raw_output(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
assert stream.getvalue() == msg assert stream.getvalue() == msg
stream = StringIO() stream = StringIO()
...@@ -179,7 +182,7 @@ def test_redirect(capfd): ...@@ -179,7 +182,7 @@ def test_redirect(capfd):
m.raw_output(msg) m.raw_output(msg)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == msg assert stdout == msg
assert stream.getvalue() == '' assert stream.getvalue() == ""
def test_redirect_err(capfd): def test_redirect_err(capfd):
...@@ -193,7 +196,7 @@ def test_redirect_err(capfd): ...@@ -193,7 +196,7 @@ def test_redirect_err(capfd):
m.raw_err(msg2) m.raw_err(msg2)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == msg assert stdout == msg
assert stderr == '' assert stderr == ""
assert stream.getvalue() == msg2 assert stream.getvalue() == msg2
...@@ -209,7 +212,7 @@ def test_redirect_both(capfd): ...@@ -209,7 +212,7 @@ def test_redirect_both(capfd):
m.raw_output(msg) m.raw_output(msg)
m.raw_err(msg2) m.raw_err(msg2)
stdout, stderr = capfd.readouterr() stdout, stderr = capfd.readouterr()
assert stdout == '' assert stdout == ""
assert stderr == '' assert stderr == ""
assert stream.getvalue() == msg assert stream.getvalue() == msg
assert stream2.getvalue() == msg2 assert stream2.getvalue() == msg2
...@@ -15,11 +15,17 @@ def test_function_signatures(doc): ...@@ -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) == "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.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_function) == "args_function(*args) -> tuple"
assert doc(m.args_kwargs_function) == "args_kwargs_function(*args, **kwargs) -> tuple" assert (
assert doc(m.KWClass.foo0) == \ doc(m.args_kwargs_function) == "args_kwargs_function(*args, **kwargs) -> tuple"
"foo0(self: m.kwargs_and_defaults.KWClass, arg0: int, arg1: float) -> None" )
assert doc(m.KWClass.foo1) == \ assert (
"foo1(self: m.kwargs_and_defaults.KWClass, x: int, y: float) -> None" 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): def test_named_arguments(msg):
...@@ -40,7 +46,9 @@ def test_named_arguments(msg): ...@@ -40,7 +46,9 @@ def test_named_arguments(msg):
# noinspection PyArgumentList # noinspection PyArgumentList
m.kw_func2(x=5, y=10, z=12) m.kw_func2(x=5, y=10, z=12)
assert excinfo.match( 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() == "{13 17}"
assert m.kw_func4(myList=[1, 2, 3]) == "{1 2 3}" assert m.kw_func4(myList=[1, 2, 3]) == "{1 2 3}"
...@@ -50,11 +58,11 @@ def test_named_arguments(msg): ...@@ -50,11 +58,11 @@ def test_named_arguments(msg):
def test_arg_and_kwargs(): def test_arg_and_kwargs():
args = 'arg1_value', 'arg2_value', 3 args = "arg1_value", "arg2_value", 3
assert m.args_function(*args) == args assert m.args_function(*args) == args
args = 'a1', 'a2' args = "a1", "a2"
kwargs = dict(arg3='a3', arg4=4) kwargs = dict(arg3="a3", arg4=4)
assert m.args_kwargs_function(*args, **kwargs) == (args, kwargs) assert m.args_kwargs_function(*args, **kwargs) == (args, kwargs)
...@@ -68,47 +76,71 @@ def test_mixed_args_and_kwargs(msg): ...@@ -68,47 +76,71 @@ def test_mixed_args_and_kwargs(msg):
assert mpa(1, 2.5) == (1, 2.5, ()) assert mpa(1, 2.5) == (1, 2.5, ())
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert mpa(1) assert mpa(1)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
mixed_plus_args(): incompatible function arguments. The following argument types are supported: mixed_plus_args(): incompatible function arguments. The following argument types are supported:
1. (arg0: int, arg1: float, *args) -> tuple 1. (arg0: int, arg1: float, *args) -> tuple
Invoked with: 1 Invoked with: 1
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert mpa() assert mpa()
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
mixed_plus_args(): incompatible function arguments. The following argument types are supported: mixed_plus_args(): incompatible function arguments. The following argument types are supported:
1. (arg0: int, arg1: float, *args) -> tuple 1. (arg0: int, arg1: float, *args) -> tuple
Invoked with: Invoked with:
""" # noqa: E501 line too long """ # 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) == ( 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() == (1, 3.14159, (), {})
assert mpakd(3) == (3, 3.14159, (), {}) assert mpakd(3) == (3, 3.14159, (), {})
assert mpakd(j=2.71828) == (1, 2.71828, (), {}) 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) == ( 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: # Arguments specified both positionally and via kwargs should fail:
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert mpakd(1, i=1) 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: 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 1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
Invoked with: 1; kwargs: i=1 Invoked with: 1; kwargs: i=1
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert mpakd(1, 2, j=1) 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: 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 1. (i: int = 1, j: float = 3.14159, *args, **kwargs) -> tuple
Invoked with: 1, 2; kwargs: j=1 Invoked with: 1, 2; kwargs: j=1
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
def test_keyword_only_args(msg): def test_keyword_only_args(msg):
...@@ -134,9 +166,9 @@ 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(j=2, i=3) == (3, 2)
assert m.kw_only_mixed(i=2, j=3) == (2, 3) 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(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(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(2, k=3, extra=4) == (2, -1, 3, {"extra": 4})
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert m.kw_only_mixed(i=1) == (1,) assert m.kw_only_mixed(i=1) == (1,)
...@@ -144,9 +176,12 @@ def test_keyword_only_args(msg): ...@@ -144,9 +176,12 @@ def test_keyword_only_args(msg):
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.register_invalid_kw_only(m) 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 arg(): cannot specify an unnamed argument after an kw_only() annotation
""" """
)
def test_positional_only_args(msg): def test_positional_only_args(msg):
...@@ -194,7 +229,10 @@ def test_signatures(): ...@@ -194,7 +229,10 @@ def test_signatures():
assert "kw_only_mixed(i: int, *, j: int) -> tuple\n" == m.kw_only_mixed.__doc__ 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_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_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") @pytest.mark.xfail("env.PYPY and env.PY2", reason="PyPy2 doesn't double count")
...@@ -219,11 +257,18 @@ def test_args_refcount(): ...@@ -219,11 +257,18 @@ def test_args_refcount():
assert m.args_function(-1, myval) == (-1, myval) assert m.args_function(-1, myval) == (-1, myval)
assert refcount(myval) == expected 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 refcount(myval) == expected
assert m.args_kwargs_function(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}) (7, 8, myval),
{"a": 1, "b": myval},
)
assert refcount(myval) == expected assert refcount(myval) == expected
exp3 = refcount(myval, myval, myval) exp3 = refcount(myval, myval, myval)
......
...@@ -36,8 +36,8 @@ def test_local_bindings(): ...@@ -36,8 +36,8 @@ def test_local_bindings():
assert i2.get() == 11 assert i2.get() == 11
assert i2.get2() == 12 assert i2.get2() == 12
assert not hasattr(i1, 'get2') assert not hasattr(i1, "get2")
assert not hasattr(i2, 'get3') assert not hasattr(i2, "get3")
# Loading within the local module # Loading within the local module
assert m.local_value(i1) == 5 assert m.local_value(i1) == 5
...@@ -55,7 +55,9 @@ def test_nonlocal_failure(): ...@@ -55,7 +55,9 @@ def test_nonlocal_failure():
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
cm.register_nonlocal() cm.register_nonlocal()
assert str(excinfo.value) == 'generic_type: type "NonLocalType" is already registered!' assert (
str(excinfo.value) == 'generic_type: type "NonLocalType" is already registered!'
)
def test_duplicate_local(): def test_duplicate_local():
...@@ -63,9 +65,12 @@ def test_duplicate_local(): ...@@ -63,9 +65,12 @@ def test_duplicate_local():
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.register_local_external() m.register_local_external()
import pybind11_tests import pybind11_tests
assert str(excinfo.value) == ( assert str(excinfo.value) == (
'generic_type: type "LocalExternal" is already registered!' 'generic_type: type "LocalExternal" is already registered!'
if hasattr(pybind11_tests, 'class_') else 'test_class not enabled') if hasattr(pybind11_tests, "class_")
else "test_class not enabled"
)
def test_stl_bind_local(): def test_stl_bind_local():
...@@ -98,8 +103,8 @@ def test_stl_bind_local(): ...@@ -98,8 +103,8 @@ def test_stl_bind_local():
d1["b"] = v1[1] d1["b"] = v1[1]
d2["c"] = v2[0] d2["c"] = v2[0]
d2["d"] = v2[1] d2["d"] = v2[1]
assert {i: d1[i].get() for i in d1} == {'a': 0, 'b': 1} assert {i: d1[i].get() for i in d1} == {"a": 0, "b": 1}
assert {i: d2[i].get() for i in d2} == {'c': 2, 'd': 3} assert {i: d2[i].get() for i in d2} == {"c": 2, "d": 3}
def test_stl_bind_global(): def test_stl_bind_global():
...@@ -107,15 +112,21 @@ def test_stl_bind_global(): ...@@ -107,15 +112,21 @@ def test_stl_bind_global():
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
cm.register_nonlocal_map() cm.register_nonlocal_map()
assert str(excinfo.value) == 'generic_type: type "NonLocalMap" is already registered!' assert (
str(excinfo.value) == 'generic_type: type "NonLocalMap" is already registered!'
)
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
cm.register_nonlocal_vec() cm.register_nonlocal_vec()
assert str(excinfo.value) == 'generic_type: type "NonLocalVec" is already registered!' assert (
str(excinfo.value) == 'generic_type: type "NonLocalVec" is already registered!'
)
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
cm.register_nonlocal_map2() cm.register_nonlocal_map2()
assert str(excinfo.value) == 'generic_type: type "NonLocalMap2" is already registered!' assert (
str(excinfo.value) == 'generic_type: type "NonLocalMap2" is already registered!'
)
def test_mixed_local_global(): def test_mixed_local_global():
...@@ -123,6 +134,7 @@ def test_mixed_local_global(): ...@@ -123,6 +134,7 @@ def test_mixed_local_global():
type can be registered even if the type is already registered globally. With the module, type can be registered even if the type is already registered globally. With the module,
casting will go to the local type; outside the module casting goes to the global type.""" casting will go to the local type; outside the module casting goes to the global type."""
import pybind11_cross_module_tests as cm import pybind11_cross_module_tests as cm
m.register_mixed_global() m.register_mixed_global()
m.register_mixed_local() m.register_mixed_local()
...@@ -145,13 +157,26 @@ def test_mixed_local_global(): ...@@ -145,13 +157,26 @@ def test_mixed_local_global():
a.append(cm.get_mixed_gl(11)) a.append(cm.get_mixed_gl(11))
a.append(cm.get_mixed_lg(12)) a.append(cm.get_mixed_lg(12))
assert [x.get() for x in a] == \ assert [x.get() for x in a] == [
[101, 1002, 103, 1004, 105, 1006, 207, 2008, 109, 1010, 211, 2012] 101,
1002,
103,
1004,
105,
1006,
207,
2008,
109,
1010,
211,
2012,
]
def test_internal_locals_differ(): def test_internal_locals_differ():
"""Makes sure the internal local type map differs across the two modules""" """Makes sure the internal local type map differs across the two modules"""
import pybind11_cross_module_tests as cm import pybind11_cross_module_tests as cm
assert m.local_cpp_types_addr() != cm.local_cpp_types_addr() assert m.local_cpp_types_addr() != cm.local_cpp_types_addr()
...@@ -169,12 +194,15 @@ def test_stl_caster_vs_stl_bind(msg): ...@@ -169,12 +194,15 @@ def test_stl_caster_vs_stl_bind(msg):
assert m.load_vector_via_caster(v2) == 6 assert m.load_vector_via_caster(v2) == 6
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
cm.load_vector_via_binding(v2) == 6 cm.load_vector_via_binding(v2) == 6
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
load_vector_via_binding(): incompatible function arguments. The following argument types are supported: load_vector_via_binding(): incompatible function arguments. The following argument types are supported:
1. (arg0: pybind11_cross_module_tests.VectorInt) -> int 1. (arg0: pybind11_cross_module_tests.VectorInt) -> int
Invoked with: [1, 2, 3] Invoked with: [1, 2, 3]
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
def test_cross_module_calls(): def test_cross_module_calls():
......
...@@ -40,17 +40,17 @@ def test_methods_and_attributes(): ...@@ -40,17 +40,17 @@ def test_methods_and_attributes():
assert instance1.overloaded(0) == "(int)" assert instance1.overloaded(0) == "(int)"
assert instance1.overloaded(1, 1.0) == "(int, float)" assert instance1.overloaded(1, 1.0) == "(int, float)"
assert instance1.overloaded(2.0, 2) == "(float, int)" assert instance1.overloaded(2.0, 2) == "(float, int)"
assert instance1.overloaded(3, 3) == "(int, int)" assert instance1.overloaded(3, 3) == "(int, int)"
assert instance1.overloaded(4., 4.) == "(float, float)" assert instance1.overloaded(4.0, 4.0) == "(float, float)"
assert instance1.overloaded_const(-3) == "(int) const" assert instance1.overloaded_const(-3) == "(int) const"
assert instance1.overloaded_const(5, 5.0) == "(int, float) const" assert instance1.overloaded_const(5, 5.0) == "(int, float) const"
assert instance1.overloaded_const(6.0, 6) == "(float, int) const" assert instance1.overloaded_const(6.0, 6) == "(float, int) const"
assert instance1.overloaded_const(7, 7) == "(int, int) const" assert instance1.overloaded_const(7, 7) == "(int, int) const"
assert instance1.overloaded_const(8., 8.) == "(float, float) const" assert instance1.overloaded_const(8.0, 8.0) == "(float, float) const"
assert instance1.overloaded_float(1, 1) == "(float, float)" assert instance1.overloaded_float(1, 1) == "(float, float)"
assert instance1.overloaded_float(1, 1.) == "(float, float)" assert instance1.overloaded_float(1, 1.0) == "(float, float)"
assert instance1.overloaded_float(1., 1) == "(float, float)" assert instance1.overloaded_float(1.0, 1) == "(float, float)"
assert instance1.overloaded_float(1., 1.) == "(float, float)" assert instance1.overloaded_float(1.0, 1.0) == "(float, float)"
assert instance1.value == 320 assert instance1.value == 320
instance1.value = 100 instance1.value = 100
...@@ -193,7 +193,10 @@ def test_metaclass_override(): ...@@ -193,7 +193,10 @@ def test_metaclass_override():
assert type(m.MetaclassOverride).__name__ == "type" assert type(m.MetaclassOverride).__name__ == "type"
assert m.MetaclassOverride.readonly == 1 assert m.MetaclassOverride.readonly == 1
assert type(m.MetaclassOverride.__dict__["readonly"]).__name__ == "pybind11_static_property" assert (
type(m.MetaclassOverride.__dict__["readonly"]).__name__
== "pybind11_static_property"
)
# Regular `type` replaces the property instead of calling `__set__()` # Regular `type` replaces the property instead of calling `__set__()`
m.MetaclassOverride.readonly = 2 m.MetaclassOverride.readonly = 2
...@@ -206,22 +209,26 @@ def test_no_mixed_overloads(): ...@@ -206,22 +209,26 @@ def test_no_mixed_overloads():
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.ExampleMandA.add_mixed_overloads1() m.ExampleMandA.add_mixed_overloads1()
assert (str(excinfo.value) == assert str(
"overloading a method with both static and instance methods is not supported; " + excinfo.value
("compile in debug mode for more details" if not debug_enabled else ) == "overloading a method with both static and instance methods is not supported; " + (
"error while attempting to bind static method ExampleMandA.overload_mixed1" "compile in debug mode for more details"
"(arg0: float) -> str") if not debug_enabled
) else "error while attempting to bind static method ExampleMandA.overload_mixed1"
"(arg0: float) -> str"
)
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.ExampleMandA.add_mixed_overloads2() m.ExampleMandA.add_mixed_overloads2()
assert (str(excinfo.value) == assert str(
"overloading a method with both static and instance methods is not supported; " + excinfo.value
("compile in debug mode for more details" if not debug_enabled else ) == "overloading a method with both static and instance methods is not supported; " + (
"error while attempting to bind instance method ExampleMandA.overload_mixed2" "compile in debug mode for more details"
"(self: pybind11_tests.methods_and_attributes.ExampleMandA, arg0: int, arg1: int)" if not debug_enabled
" -> str") else "error while attempting to bind instance method ExampleMandA.overload_mixed2"
) "(self: pybind11_tests.methods_and_attributes.ExampleMandA, arg0: int, arg1: int)"
" -> str"
)
@pytest.mark.parametrize("access", ["ro", "rw", "static_ro", "static_rw"]) @pytest.mark.parametrize("access", ["ro", "rw", "static_ro", "static_rw"])
...@@ -333,8 +340,8 @@ def test_bad_arg_default(msg): ...@@ -333,8 +340,8 @@ def test_bad_arg_default(msg):
assert msg(excinfo.value) == ( assert msg(excinfo.value) == (
"arg(): could not convert default argument 'a: UnregisteredType' in function " "arg(): could not convert default argument 'a: UnregisteredType' in function "
"'should_fail' into a Python object (type not registered yet?)" "'should_fail' into a Python object (type not registered yet?)"
if debug_enabled else if debug_enabled
"arg(): could not convert default argument into a Python object (type not registered " else "arg(): could not convert default argument into a Python object (type not registered "
"yet?). Compile in debug mode for more information." "yet?). Compile in debug mode for more information."
) )
...@@ -343,8 +350,8 @@ def test_bad_arg_default(msg): ...@@ -343,8 +350,8 @@ def test_bad_arg_default(msg):
assert msg(excinfo.value) == ( assert msg(excinfo.value) == (
"arg(): could not convert default argument 'UnregisteredType' in function " "arg(): could not convert default argument 'UnregisteredType' in function "
"'should_fail' into a Python object (type not registered yet?)" "'should_fail' into a Python object (type not registered yet?)"
if debug_enabled else if debug_enabled
"arg(): could not convert default argument into a Python object (type not registered " else "arg(): could not convert default argument into a Python object (type not registered "
"yet?). Compile in debug mode for more information." "yet?). Compile in debug mode for more information."
) )
...@@ -381,12 +388,15 @@ def test_accepts_none(msg): ...@@ -381,12 +388,15 @@ def test_accepts_none(msg):
# The first one still raises because you can't pass None as a lvalue reference arg: # The first one still raises because you can't pass None as a lvalue reference arg:
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
assert m.ok_none1(None) == -1 assert m.ok_none1(None) == -1
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
ok_none1(): incompatible function arguments. The following argument types are supported: ok_none1(): incompatible function arguments. The following argument types are supported:
1. (arg0: m.methods_and_attributes.NoneTester) -> int 1. (arg0: m.methods_and_attributes.NoneTester) -> int
Invoked with: None Invoked with: None
""" """
)
# The rest take the argument as pointer or holder, and accept None: # The rest take the argument as pointer or holder, and accept None:
assert m.ok_none2(None) == -1 assert m.ok_none2(None) == -1
...@@ -402,13 +412,16 @@ def test_str_issue(msg): ...@@ -402,13 +412,16 @@ def test_str_issue(msg):
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
str(m.StrIssue("no", "such", "constructor")) str(m.StrIssue("no", "such", "constructor"))
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
__init__(): incompatible constructor arguments. The following argument types are supported: __init__(): incompatible constructor arguments. The following argument types are supported:
1. m.methods_and_attributes.StrIssue(arg0: int) 1. m.methods_and_attributes.StrIssue(arg0: int)
2. m.methods_and_attributes.StrIssue() 2. m.methods_and_attributes.StrIssue()
Invoked with: 'no', 'such', 'constructor' Invoked with: 'no', 'such', 'constructor'
""" """
)
def test_unregistered_base_implementations(): def test_unregistered_base_implementations():
...@@ -441,7 +454,7 @@ def test_ref_qualified(): ...@@ -441,7 +454,7 @@ def test_ref_qualified():
def test_overload_ordering(): def test_overload_ordering():
'Check to see if the normal overload order (first defined) and prepend overload order works' "Check to see if the normal overload order (first defined) and prepend overload order works"
assert m.overload_order("string") == 1 assert m.overload_order("string") == 1
assert m.overload_order(0) == 4 assert m.overload_order(0) == 4
...@@ -449,8 +462,14 @@ def test_overload_ordering(): ...@@ -449,8 +462,14 @@ def test_overload_ordering():
uni_name = type(u"").__name__ uni_name = type(u"").__name__
assert "1. overload_order(arg0: int) -> int" in m.overload_order.__doc__ assert "1. overload_order(arg0: int) -> int" in m.overload_order.__doc__
assert "2. overload_order(arg0: {}) -> int".format(uni_name) in m.overload_order.__doc__ assert (
assert "3. overload_order(arg0: {}) -> int".format(uni_name) in m.overload_order.__doc__ "2. overload_order(arg0: {}) -> int".format(uni_name)
in m.overload_order.__doc__
)
assert (
"3. overload_order(arg0: {}) -> int".format(uni_name)
in m.overload_order.__doc__
)
assert "4. overload_order(arg0: int) -> int" in m.overload_order.__doc__ assert "4. overload_order(arg0: int) -> int" in m.overload_order.__doc__
with pytest.raises(TypeError) as err: with pytest.raises(TypeError) as err:
......
...@@ -6,9 +6,13 @@ from pybind11_tests import ConstructorStats ...@@ -6,9 +6,13 @@ from pybind11_tests import ConstructorStats
def test_nested_modules(): def test_nested_modules():
import pybind11_tests import pybind11_tests
assert pybind11_tests.__name__ == "pybind11_tests" assert pybind11_tests.__name__ == "pybind11_tests"
assert pybind11_tests.modules.__name__ == "pybind11_tests.modules" assert pybind11_tests.modules.__name__ == "pybind11_tests.modules"
assert pybind11_tests.modules.subsubmodule.__name__ == "pybind11_tests.modules.subsubmodule" assert (
pybind11_tests.modules.subsubmodule.__name__
== "pybind11_tests.modules.subsubmodule"
)
assert m.__name__ == "pybind11_tests.modules" assert m.__name__ == "pybind11_tests.modules"
assert ms.__name__ == "pybind11_tests.modules.subsubmodule" assert ms.__name__ == "pybind11_tests.modules.subsubmodule"
...@@ -35,7 +39,7 @@ def test_reference_internal(): ...@@ -35,7 +39,7 @@ def test_reference_internal():
del b del b
assert astats.alive() == 0 assert astats.alive() == 0
assert bstats.alive() == 0 assert bstats.alive() == 0
assert astats.values() == ['1', '2', '42', '43'] assert astats.values() == ["1", "2", "42", "43"]
assert bstats.values() == [] assert bstats.values() == []
assert astats.default_constructions == 0 assert astats.default_constructions == 0
assert bstats.default_constructions == 1 assert bstats.default_constructions == 1
...@@ -54,7 +58,7 @@ def test_importing(): ...@@ -54,7 +58,7 @@ def test_importing():
from collections import OrderedDict from collections import OrderedDict
assert OD is OrderedDict assert OD is OrderedDict
assert str(OD([(1, 'a'), (2, 'b')])) == "OrderedDict([(1, 'a'), (2, 'b')])" assert str(OD([(1, "a"), (2, "b")])) == "OrderedDict([(1, 'a'), (2, 'b')])"
def test_pydoc(): def test_pydoc():
......
...@@ -57,7 +57,6 @@ def test_multiple_inheritance_mix2(): ...@@ -57,7 +57,6 @@ def test_multiple_inheritance_mix2():
@pytest.mark.skipif("env.PYPY and env.PY2") @pytest.mark.skipif("env.PYPY and env.PY2")
@pytest.mark.xfail("env.PYPY and not env.PY2") @pytest.mark.xfail("env.PYPY and not env.PY2")
def test_multiple_inheritance_python(): def test_multiple_inheritance_python():
class MI1(m.Base1, m.Base2): class MI1(m.Base1, m.Base2):
def __init__(self, i, j): def __init__(self, i, j):
m.Base1.__init__(self, i) m.Base1.__init__(self, i)
...@@ -163,7 +162,6 @@ def test_multiple_inheritance_python(): ...@@ -163,7 +162,6 @@ def test_multiple_inheritance_python():
def test_multiple_inheritance_python_many_bases(): def test_multiple_inheritance_python_many_bases():
class MIMany14(m.BaseN1, m.BaseN2, m.BaseN3, m.BaseN4): class MIMany14(m.BaseN1, m.BaseN2, m.BaseN3, m.BaseN4):
def __init__(self): def __init__(self):
m.BaseN1.__init__(self, 1) m.BaseN1.__init__(self, 1)
...@@ -178,8 +176,16 @@ def test_multiple_inheritance_python_many_bases(): ...@@ -178,8 +176,16 @@ def test_multiple_inheritance_python_many_bases():
m.BaseN7.__init__(self, 7) m.BaseN7.__init__(self, 7)
m.BaseN8.__init__(self, 8) m.BaseN8.__init__(self, 8)
class MIMany916(m.BaseN9, m.BaseN10, m.BaseN11, m.BaseN12, m.BaseN13, m.BaseN14, m.BaseN15, class MIMany916(
m.BaseN16): m.BaseN9,
m.BaseN10,
m.BaseN11,
m.BaseN12,
m.BaseN13,
m.BaseN14,
m.BaseN15,
m.BaseN16,
):
def __init__(self): def __init__(self):
m.BaseN9.__init__(self, 9) m.BaseN9.__init__(self, 9)
m.BaseN10.__init__(self, 10) m.BaseN10.__init__(self, 10)
...@@ -225,7 +231,6 @@ def test_multiple_inheritance_python_many_bases(): ...@@ -225,7 +231,6 @@ def test_multiple_inheritance_python_many_bases():
def test_multiple_inheritance_virtbase(): def test_multiple_inheritance_virtbase():
class MITypePy(m.Base12a): class MITypePy(m.Base12a):
def __init__(self, i, j): def __init__(self, i, j):
m.Base12a.__init__(self, i, j) m.Base12a.__init__(self, i, j)
...@@ -238,7 +243,7 @@ def test_multiple_inheritance_virtbase(): ...@@ -238,7 +243,7 @@ def test_multiple_inheritance_virtbase():
def test_mi_static_properties(): def test_mi_static_properties():
"""Mixing bases with and without static properties should be possible """Mixing bases with and without static properties should be possible
and the result should be independent of base definition order""" and the result should be independent of base definition order"""
for d in (m.VanillaStaticMix1(), m.VanillaStaticMix2()): for d in (m.VanillaStaticMix1(), m.VanillaStaticMix2()):
assert d.vanilla() == "Vanilla" assert d.vanilla() == "Vanilla"
......
...@@ -32,12 +32,15 @@ def test_pointers(msg): ...@@ -32,12 +32,15 @@ def test_pointers(msg):
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.get_void_ptr_value([1, 2, 3]) # This should not work m.get_void_ptr_value([1, 2, 3]) # This should not work
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
get_void_ptr_value(): incompatible function arguments. The following argument types are supported: get_void_ptr_value(): incompatible function arguments. The following argument types are supported:
1. (arg0: capsule) -> int 1. (arg0: capsule) -> int
Invoked with: [1, 2, 3] Invoked with: [1, 2, 3]
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
assert m.return_null_str() is None assert m.return_null_str() is None
assert m.get_null_str_value(m.return_null_str()) is not None assert m.get_null_str_value(m.return_null_str()) is not None
......
...@@ -56,23 +56,23 @@ def test_operator_overloading(): ...@@ -56,23 +56,23 @@ def test_operator_overloading():
del v3 del v3
assert cstats.alive() == 0 assert cstats.alive() == 0
assert cstats.values() == [ assert cstats.values() == [
'[1.000000, 2.000000]', "[1.000000, 2.000000]",
'[3.000000, -1.000000]', "[3.000000, -1.000000]",
'[1.000000, 2.000000]', "[1.000000, 2.000000]",
'[-3.000000, 1.000000]', "[-3.000000, 1.000000]",
'[4.000000, 1.000000]', "[4.000000, 1.000000]",
'[-2.000000, 3.000000]', "[-2.000000, 3.000000]",
'[-7.000000, -6.000000]', "[-7.000000, -6.000000]",
'[9.000000, 10.000000]', "[9.000000, 10.000000]",
'[8.000000, 16.000000]', "[8.000000, 16.000000]",
'[0.125000, 0.250000]', "[0.125000, 0.250000]",
'[7.000000, 6.000000]', "[7.000000, 6.000000]",
'[9.000000, 10.000000]', "[9.000000, 10.000000]",
'[8.000000, 16.000000]', "[8.000000, 16.000000]",
'[8.000000, 4.000000]', "[8.000000, 4.000000]",
'[3.000000, -2.000000]', "[3.000000, -2.000000]",
'[3.000000, -0.500000]', "[3.000000, -0.500000]",
'[6.000000, -2.000000]', "[6.000000, -2.000000]",
] ]
assert cstats.default_constructions == 0 assert cstats.default_constructions == 0
assert cstats.copy_constructions == 0 assert cstats.copy_constructions == 0
......
...@@ -42,5 +42,6 @@ def test_roundtrip_with_dict(cls_name): ...@@ -42,5 +42,6 @@ def test_roundtrip_with_dict(cls_name):
def test_enum_pickle(): def test_enum_pickle():
from pybind11_tests import enums as e from pybind11_tests import enums as e
data = pickle.dumps(e.EOne, 2) data = pickle.dumps(e.EOne, 2)
assert e.EOne == pickle.loads(data) assert e.EOne == pickle.loads(data)
...@@ -10,7 +10,9 @@ def isclose(a, b, rel_tol=1e-05, abs_tol=0.0): ...@@ -10,7 +10,9 @@ def isclose(a, b, rel_tol=1e-05, abs_tol=0.0):
def allclose(a_list, b_list, rel_tol=1e-05, abs_tol=0.0): def allclose(a_list, b_list, rel_tol=1e-05, abs_tol=0.0):
return all(isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol) for a, b in zip(a_list, b_list)) return all(
isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol) for a, b in zip(a_list, b_list)
)
def test_generalized_iterators(): def test_generalized_iterators():
...@@ -51,7 +53,7 @@ def test_sequence(): ...@@ -51,7 +53,7 @@ def test_sequence():
cstats = ConstructorStats.get(m.Sequence) cstats = ConstructorStats.get(m.Sequence)
s = m.Sequence(5) s = m.Sequence(5)
assert cstats.values() == ['of size', '5'] assert cstats.values() == ["of size", "5"]
assert "Sequence" in repr(s) assert "Sequence" in repr(s)
assert len(s) == 5 assert len(s) == 5
...@@ -62,16 +64,16 @@ def test_sequence(): ...@@ -62,16 +64,16 @@ def test_sequence():
assert isclose(s[0], 12.34) and isclose(s[3], 56.78) assert isclose(s[0], 12.34) and isclose(s[3], 56.78)
rev = reversed(s) rev = reversed(s)
assert cstats.values() == ['of size', '5'] assert cstats.values() == ["of size", "5"]
rev2 = s[::-1] rev2 = s[::-1]
assert cstats.values() == ['of size', '5'] assert cstats.values() == ["of size", "5"]
it = iter(m.Sequence(0)) it = iter(m.Sequence(0))
for _ in range(3): # __next__ must continue to raise StopIteration for _ in range(3): # __next__ must continue to raise StopIteration
with pytest.raises(StopIteration): with pytest.raises(StopIteration):
next(it) next(it)
assert cstats.values() == ['of size', '0'] assert cstats.values() == ["of size", "0"]
expected = [0, 56.78, 0, 0, 12.34] expected = [0, 56.78, 0, 0, 12.34]
assert allclose(rev, expected) assert allclose(rev, expected)
...@@ -79,7 +81,7 @@ def test_sequence(): ...@@ -79,7 +81,7 @@ def test_sequence():
assert rev == rev2 assert rev == rev2
rev[0::2] = m.Sequence([2.0, 2.0, 2.0]) rev[0::2] = m.Sequence([2.0, 2.0, 2.0])
assert cstats.values() == ['of size', '3', 'from std::vector'] assert cstats.values() == ["of size", "3", "from std::vector"]
assert allclose(rev, [2, 56.78, 2, 0, 2]) assert allclose(rev, [2, 56.78, 2, 0, 2])
...@@ -103,10 +105,11 @@ def test_sequence(): ...@@ -103,10 +105,11 @@ def test_sequence():
def test_sequence_length(): def test_sequence_length():
"""#2076: Exception raised by len(arg) should be propagated """ """#2076: Exception raised by len(arg) should be propagated """
class BadLen(RuntimeError): class BadLen(RuntimeError):
pass pass
class SequenceLike(): class SequenceLike:
def __getitem__(self, i): def __getitem__(self, i):
return None return None
...@@ -121,17 +124,17 @@ def test_sequence_length(): ...@@ -121,17 +124,17 @@ def test_sequence_length():
def test_map_iterator(): def test_map_iterator():
sm = m.StringMap({'hi': 'bye', 'black': 'white'}) sm = m.StringMap({"hi": "bye", "black": "white"})
assert sm['hi'] == 'bye' assert sm["hi"] == "bye"
assert len(sm) == 2 assert len(sm) == 2
assert sm['black'] == 'white' assert sm["black"] == "white"
with pytest.raises(KeyError): with pytest.raises(KeyError):
assert sm['orange'] assert sm["orange"]
sm['orange'] = 'banana' sm["orange"] = "banana"
assert sm['orange'] == 'banana' assert sm["orange"] == "banana"
expected = {'hi': 'bye', 'black': 'white', 'orange': 'banana'} expected = {"hi": "bye", "black": "white", "orange": "banana"}
for k in sm: for k in sm:
assert sm[k] == expected[k] assert sm[k] == expected[k]
for k, v in sm.items(): for k, v in sm.items():
...@@ -179,7 +182,8 @@ def test_iterator_passthrough(): ...@@ -179,7 +182,8 @@ def test_iterator_passthrough():
"""#181: iterator passthrough did not compile""" """#181: iterator passthrough did not compile"""
from pybind11_tests.sequences_and_iterators import iterator_passthrough from pybind11_tests.sequences_and_iterators import iterator_passthrough
assert list(iterator_passthrough(iter([3, 5, 7, 9, 11, 13, 15]))) == [3, 5, 7, 9, 11, 13, 15] values = [3, 5, 7, 9, 11, 13, 15]
assert list(iterator_passthrough(iter(values))) == values
def test_iterator_rvp(): def test_iterator_rvp():
......
...@@ -7,7 +7,9 @@ from pybind11_tests import ConstructorStats # noqa: E402 ...@@ -7,7 +7,9 @@ from pybind11_tests import ConstructorStats # noqa: E402
def test_smart_ptr(capture): def test_smart_ptr(capture):
# Object1 # Object1
for i, o in enumerate([m.make_object_1(), m.make_object_2(), m.MyObject1(3)], start=1): for i, o in enumerate(
[m.make_object_1(), m.make_object_2(), m.MyObject1(3)], start=1
):
assert o.getRefCount() == 1 assert o.getRefCount() == 1
with capture: with capture:
m.print_object_1(o) m.print_object_1(o)
...@@ -16,8 +18,9 @@ def test_smart_ptr(capture): ...@@ -16,8 +18,9 @@ def test_smart_ptr(capture):
m.print_object_4(o) m.print_object_4(o)
assert capture == "MyObject1[{i}]\n".format(i=i) * 4 assert capture == "MyObject1[{i}]\n".format(i=i) * 4
for i, o in enumerate([m.make_myobject1_1(), m.make_myobject1_2(), m.MyObject1(6), 7], for i, o in enumerate(
start=4): [m.make_myobject1_1(), m.make_myobject1_2(), m.MyObject1(6), 7], start=4
):
print(o) print(o)
with capture: with capture:
if not isinstance(o, int): if not isinstance(o, int):
...@@ -29,11 +32,15 @@ def test_smart_ptr(capture): ...@@ -29,11 +32,15 @@ def test_smart_ptr(capture):
m.print_myobject1_2(o) m.print_myobject1_2(o)
m.print_myobject1_3(o) m.print_myobject1_3(o)
m.print_myobject1_4(o) m.print_myobject1_4(o)
assert capture == "MyObject1[{i}]\n".format(i=i) * (4 if isinstance(o, int) else 8)
times = 4 if isinstance(o, int) else 8
assert capture == "MyObject1[{i}]\n".format(i=i) * times
cstats = ConstructorStats.get(m.MyObject1) cstats = ConstructorStats.get(m.MyObject1)
assert cstats.alive() == 0 assert cstats.alive() == 0
expected_values = ['MyObject1[{}]'.format(i) for i in range(1, 7)] + ['MyObject1[7]'] * 4 expected_values = ["MyObject1[{}]".format(i) for i in range(1, 7)] + [
"MyObject1[7]"
] * 4
assert cstats.values() == expected_values assert cstats.values() == expected_values
assert cstats.default_constructions == 0 assert cstats.default_constructions == 0
assert cstats.copy_constructions == 0 assert cstats.copy_constructions == 0
...@@ -42,7 +49,9 @@ def test_smart_ptr(capture): ...@@ -42,7 +49,9 @@ def test_smart_ptr(capture):
assert cstats.move_assignments == 0 assert cstats.move_assignments == 0
# Object2 # Object2
for i, o in zip([8, 6, 7], [m.MyObject2(8), m.make_myobject2_1(), m.make_myobject2_2()]): for i, o in zip(
[8, 6, 7], [m.MyObject2(8), m.make_myobject2_1(), m.make_myobject2_2()]
):
print(o) print(o)
with capture: with capture:
m.print_myobject2_1(o) m.print_myobject2_1(o)
...@@ -55,7 +64,7 @@ def test_smart_ptr(capture): ...@@ -55,7 +64,7 @@ def test_smart_ptr(capture):
assert cstats.alive() == 1 assert cstats.alive() == 1
o = None o = None
assert cstats.alive() == 0 assert cstats.alive() == 0
assert cstats.values() == ['MyObject2[8]', 'MyObject2[6]', 'MyObject2[7]'] assert cstats.values() == ["MyObject2[8]", "MyObject2[6]", "MyObject2[7]"]
assert cstats.default_constructions == 0 assert cstats.default_constructions == 0
assert cstats.copy_constructions == 0 assert cstats.copy_constructions == 0
# assert cstats.move_constructions >= 0 # Doesn't invoke any # assert cstats.move_constructions >= 0 # Doesn't invoke any
...@@ -63,7 +72,9 @@ def test_smart_ptr(capture): ...@@ -63,7 +72,9 @@ def test_smart_ptr(capture):
assert cstats.move_assignments == 0 assert cstats.move_assignments == 0
# Object3 # Object3
for i, o in zip([9, 8, 9], [m.MyObject3(9), m.make_myobject3_1(), m.make_myobject3_2()]): for i, o in zip(
[9, 8, 9], [m.MyObject3(9), m.make_myobject3_1(), m.make_myobject3_2()]
):
print(o) print(o)
with capture: with capture:
m.print_myobject3_1(o) m.print_myobject3_1(o)
...@@ -76,7 +87,7 @@ def test_smart_ptr(capture): ...@@ -76,7 +87,7 @@ def test_smart_ptr(capture):
assert cstats.alive() == 1 assert cstats.alive() == 1
o = None o = None
assert cstats.alive() == 0 assert cstats.alive() == 0
assert cstats.values() == ['MyObject3[9]', 'MyObject3[8]', 'MyObject3[9]'] assert cstats.values() == ["MyObject3[9]", "MyObject3[8]", "MyObject3[9]"]
assert cstats.default_constructions == 0 assert cstats.default_constructions == 0
assert cstats.copy_constructions == 0 assert cstats.copy_constructions == 0
# assert cstats.move_constructions >= 0 # Doesn't invoke any # assert cstats.move_constructions >= 0 # Doesn't invoke any
...@@ -96,7 +107,7 @@ def test_smart_ptr(capture): ...@@ -96,7 +107,7 @@ def test_smart_ptr(capture):
# ref<> # ref<>
cstats = m.cstats_ref() cstats = m.cstats_ref()
assert cstats.alive() == 0 assert cstats.alive() == 0
assert cstats.values() == ['from pointer'] * 10 assert cstats.values() == ["from pointer"] * 10
assert cstats.default_constructions == 30 assert cstats.default_constructions == 30
assert cstats.copy_constructions == 12 assert cstats.copy_constructions == 12
# assert cstats.move_constructions >= 0 # Doesn't invoke any # assert cstats.move_constructions >= 0 # Doesn't invoke any
...@@ -186,7 +197,9 @@ def test_shared_ptr_from_this_and_references(): ...@@ -186,7 +197,9 @@ def test_shared_ptr_from_this_and_references():
ref = s.ref # init_holder_helper(holder_ptr=false, owned=false, bad_wp=false) ref = s.ref # init_holder_helper(holder_ptr=false, owned=false, bad_wp=false)
assert stats.alive() == 2 assert stats.alive() == 2
assert s.set_ref(ref) assert s.set_ref(ref)
assert s.set_holder(ref) # std::enable_shared_from_this can create a holder from a reference assert s.set_holder(
ref
) # std::enable_shared_from_this can create a holder from a reference
bad_wp = s.bad_wp # init_holder_helper(holder_ptr=false, owned=false, bad_wp=true) bad_wp = s.bad_wp # init_holder_helper(holder_ptr=false, owned=false, bad_wp=true)
assert stats.alive() == 2 assert stats.alive() == 2
...@@ -200,12 +213,16 @@ def test_shared_ptr_from_this_and_references(): ...@@ -200,12 +213,16 @@ def test_shared_ptr_from_this_and_references():
assert s.set_ref(copy) assert s.set_ref(copy)
assert s.set_holder(copy) assert s.set_holder(copy)
holder_ref = s.holder_ref # init_holder_helper(holder_ptr=true, owned=false, bad_wp=false) holder_ref = (
s.holder_ref
) # init_holder_helper(holder_ptr=true, owned=false, bad_wp=false)
assert stats.alive() == 3 assert stats.alive() == 3
assert s.set_ref(holder_ref) assert s.set_ref(holder_ref)
assert s.set_holder(holder_ref) assert s.set_holder(holder_ref)
holder_copy = s.holder_copy # init_holder_helper(holder_ptr=true, owned=true, bad_wp=false) holder_copy = (
s.holder_copy
) # init_holder_helper(holder_ptr=true, owned=true, bad_wp=false)
assert stats.alive() == 3 assert stats.alive() == 3
assert s.set_ref(holder_copy) assert s.set_ref(holder_copy)
assert s.set_holder(holder_copy) assert s.set_holder(holder_copy)
...@@ -277,8 +294,10 @@ def test_smart_ptr_from_default(): ...@@ -277,8 +294,10 @@ def test_smart_ptr_from_default():
instance = m.HeldByDefaultHolder() instance = m.HeldByDefaultHolder()
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.HeldByDefaultHolder.load_shared_ptr(instance) m.HeldByDefaultHolder.load_shared_ptr(instance)
assert "Unable to load a custom holder type from a " \ assert (
"default-holder instance" in str(excinfo.value) "Unable to load a custom holder type from a "
"default-holder instance" in str(excinfo.value)
)
def test_shared_ptr_gc(): def test_shared_ptr_gc():
......
...@@ -88,7 +88,7 @@ def test_recursive_casting(): ...@@ -88,7 +88,7 @@ def test_recursive_casting():
assert m.cast_rv_nested() == [[[{"b": "rvalue", "c": "rvalue"}], [{"a": "rvalue"}]]] assert m.cast_rv_nested() == [[[{"b": "rvalue", "c": "rvalue"}], [{"a": "rvalue"}]]]
assert m.cast_lv_nested() == { assert m.cast_lv_nested() == {
"a": [[["lvalue", "lvalue"]], [["lvalue", "lvalue"]]], "a": [[["lvalue", "lvalue"]], [["lvalue", "lvalue"]]],
"b": [[["lvalue", "lvalue"], ["lvalue", "lvalue"]]] "b": [[["lvalue", "lvalue"], ["lvalue", "lvalue"]]],
} }
# Issue #853 test case: # Issue #853 test case:
...@@ -106,15 +106,15 @@ def test_move_out_container(): ...@@ -106,15 +106,15 @@ def test_move_out_container():
assert [x.value for x in moved_out_list] == [0, 1, 2] assert [x.value for x in moved_out_list] == [0, 1, 2]
@pytest.mark.skipif(not hasattr(m, "has_optional"), reason='no <optional>') @pytest.mark.skipif(not hasattr(m, "has_optional"), reason="no <optional>")
def test_optional(): def test_optional():
assert m.double_or_zero(None) == 0 assert m.double_or_zero(None) == 0
assert m.double_or_zero(42) == 84 assert m.double_or_zero(42) == 84
pytest.raises(TypeError, m.double_or_zero, 'foo') pytest.raises(TypeError, m.double_or_zero, "foo")
assert m.half_or_none(0) is None assert m.half_or_none(0) is None
assert m.half_or_none(42) == 21 assert m.half_or_none(42) == 21
pytest.raises(TypeError, m.half_or_none, 'foo') pytest.raises(TypeError, m.half_or_none, "foo")
assert m.test_nullopt() == 42 assert m.test_nullopt() == 42
assert m.test_nullopt(None) == 42 assert m.test_nullopt(None) == 42
...@@ -134,15 +134,17 @@ def test_optional(): ...@@ -134,15 +134,17 @@ def test_optional():
assert holder.member_initialized() assert holder.member_initialized()
@pytest.mark.skipif(not hasattr(m, "has_exp_optional"), reason='no <experimental/optional>') @pytest.mark.skipif(
not hasattr(m, "has_exp_optional"), reason="no <experimental/optional>"
)
def test_exp_optional(): def test_exp_optional():
assert m.double_or_zero_exp(None) == 0 assert m.double_or_zero_exp(None) == 0
assert m.double_or_zero_exp(42) == 84 assert m.double_or_zero_exp(42) == 84
pytest.raises(TypeError, m.double_or_zero_exp, 'foo') pytest.raises(TypeError, m.double_or_zero_exp, "foo")
assert m.half_or_none_exp(0) is None assert m.half_or_none_exp(0) is None
assert m.half_or_none_exp(42) == 21 assert m.half_or_none_exp(42) == 21
pytest.raises(TypeError, m.half_or_none_exp, 'foo') pytest.raises(TypeError, m.half_or_none_exp, "foo")
assert m.test_nullopt_exp() == 42 assert m.test_nullopt_exp() == 42
assert m.test_nullopt_exp(None) == 42 assert m.test_nullopt_exp(None) == 42
...@@ -160,7 +162,7 @@ def test_exp_optional(): ...@@ -160,7 +162,7 @@ def test_exp_optional():
assert holder.member_initialized() assert holder.member_initialized()
@pytest.mark.skipif(not hasattr(m, "load_variant"), reason='no <variant>') @pytest.mark.skipif(not hasattr(m, "load_variant"), reason="no <variant>")
def test_variant(doc): def test_variant(doc):
assert m.load_variant(1) == "int" assert m.load_variant(1) == "int"
assert m.load_variant("1") == "std::string" assert m.load_variant("1") == "std::string"
...@@ -172,34 +174,44 @@ def test_variant(doc): ...@@ -172,34 +174,44 @@ def test_variant(doc):
assert m.cast_variant() == (5, "Hello") assert m.cast_variant() == (5, "Hello")
assert doc(m.load_variant) == "load_variant(arg0: Union[int, str, float, None]) -> str" assert (
doc(m.load_variant) == "load_variant(arg0: Union[int, str, float, None]) -> str"
)
def test_vec_of_reference_wrapper(): def test_vec_of_reference_wrapper():
"""#171: Can't return reference wrappers (or STL structures containing them)""" """#171: Can't return reference wrappers (or STL structures containing them)"""
assert str(m.return_vec_of_reference_wrapper(UserType(4))) == \ assert (
"[UserType(1), UserType(2), UserType(3), UserType(4)]" str(m.return_vec_of_reference_wrapper(UserType(4)))
== "[UserType(1), UserType(2), UserType(3), UserType(4)]"
)
def test_stl_pass_by_pointer(msg): def test_stl_pass_by_pointer(msg):
"""Passing nullptr or None to an STL container pointer is not expected to work""" """Passing nullptr or None to an STL container pointer is not expected to work"""
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.stl_pass_by_pointer() # default value is `nullptr` m.stl_pass_by_pointer() # default value is `nullptr`
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported: stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
1. (v: List[int] = None) -> List[int] 1. (v: List[int] = None) -> List[int]
Invoked with: Invoked with:
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
m.stl_pass_by_pointer(None) m.stl_pass_by_pointer(None)
assert msg(excinfo.value) == """ assert (
msg(excinfo.value)
== """
stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported: stl_pass_by_pointer(): incompatible function arguments. The following argument types are supported:
1. (v: List[int] = None) -> List[int] 1. (v: List[int] = None) -> List[int]
Invoked with: None Invoked with: None
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
assert m.stl_pass_by_pointer([1, 2, 3]) == [1, 2, 3] assert m.stl_pass_by_pointer([1, 2, 3]) == [1, 2, 3]
...@@ -209,10 +221,12 @@ def test_missing_header_message(): ...@@ -209,10 +221,12 @@ def test_missing_header_message():
<pybind11/stl.h> should result in a helpful suggestion in the error message""" <pybind11/stl.h> should result in a helpful suggestion in the error message"""
import pybind11_cross_module_tests as cm import pybind11_cross_module_tests as cm
expected_message = ("Did you forget to `#include <pybind11/stl.h>`? Or <pybind11/complex.h>,\n" expected_message = (
"<pybind11/functional.h>, <pybind11/chrono.h>, etc. Some automatic\n" "Did you forget to `#include <pybind11/stl.h>`? Or <pybind11/complex.h>,\n"
"conversions are optional and require extra headers to be included\n" "<pybind11/functional.h>, <pybind11/chrono.h>, etc. Some automatic\n"
"when compiling your pybind11 module.") "conversions are optional and require extra headers to be included\n"
"when compiling your pybind11 module."
)
with pytest.raises(TypeError) as excinfo: with pytest.raises(TypeError) as excinfo:
cm.missing_header_arg([1.0, 2.0, 3.0]) cm.missing_header_arg([1.0, 2.0, 3.0])
...@@ -226,9 +240,9 @@ def test_missing_header_message(): ...@@ -226,9 +240,9 @@ def test_missing_header_message():
def test_function_with_string_and_vector_string_arg(): def test_function_with_string_and_vector_string_arg():
"""Check if a string is NOT implicitly converted to a list, which was the """Check if a string is NOT implicitly converted to a list, which was the
behavior before fix of issue #1258""" behavior before fix of issue #1258"""
assert m.func_with_string_or_vector_string_arg_overload(('A', 'B', )) == 2 assert m.func_with_string_or_vector_string_arg_overload(("A", "B")) == 2
assert m.func_with_string_or_vector_string_arg_overload(['A', 'B']) == 2 assert m.func_with_string_or_vector_string_arg_overload(["A", "B"]) == 2
assert m.func_with_string_or_vector_string_arg_overload('A') == 3 assert m.func_with_string_or_vector_string_arg_overload("A") == 3
def test_stl_ownership(): def test_stl_ownership():
...@@ -247,6 +261,6 @@ def test_array_cast_sequence(): ...@@ -247,6 +261,6 @@ def test_array_cast_sequence():
def test_issue_1561(): def test_issue_1561():
""" check fix for issue #1561 """ """ check fix for issue #1561 """
bar = m.Issue1561Outer() bar = m.Issue1561Outer()
bar.list = [m.Issue1561Inner('bar')] bar.list = [m.Issue1561Inner("bar")]
bar.list bar.list
assert bar.list[0].data == 'bar' assert bar.list[0].data == "bar"
...@@ -45,7 +45,7 @@ def test_vector_int(): ...@@ -45,7 +45,7 @@ def test_vector_int():
# test error handling, and that the vector is unchanged # test error handling, and that the vector is unchanged
with pytest.raises(RuntimeError): with pytest.raises(RuntimeError):
v_int2.extend([8, 'a']) v_int2.extend([8, "a"])
assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7]) assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7])
...@@ -79,8 +79,8 @@ def test_vector_buffer(): ...@@ -79,8 +79,8 @@ def test_vector_buffer():
assert mv[2] == 5 assert mv[2] == 5
mv[2] = 6 mv[2] = 6
else: else:
assert mv[2] == '\x05' assert mv[2] == "\x05"
mv[2] = '\x06' mv[2] = "\x06"
assert v[2] == 6 assert v[2] == 6
if not env.PY2: if not env.PY2:
...@@ -114,11 +114,17 @@ def test_vector_buffer_numpy(): ...@@ -114,11 +114,17 @@ def test_vector_buffer_numpy():
v = m.get_vectorstruct() v = m.get_vectorstruct()
assert v[0].x == 5 assert v[0].x == 5
ma = np.asarray(v) ma = np.asarray(v)
ma[1]['x'] = 99 ma[1]["x"] = 99
assert v[1].x == 99 assert v[1].x == 99
v = m.VectorStruct(np.zeros(3, dtype=np.dtype([('w', 'bool'), ('x', 'I'), v = m.VectorStruct(
('y', 'float64'), ('z', 'bool')], align=True))) np.zeros(
3,
dtype=np.dtype(
[("w", "bool"), ("x", "I"), ("y", "float64"), ("z", "bool")], align=True
),
)
)
assert len(v) == 3 assert len(v) == 3
b = np.array([1, 2, 3, 4], dtype=np.uint8) b = np.array([1, 2, 3, 4], dtype=np.uint8)
...@@ -151,31 +157,31 @@ def test_vector_custom(): ...@@ -151,31 +157,31 @@ def test_vector_custom():
def test_map_string_double(): def test_map_string_double():
mm = m.MapStringDouble() mm = m.MapStringDouble()
mm['a'] = 1 mm["a"] = 1
mm['b'] = 2.5 mm["b"] = 2.5
assert list(mm) == ['a', 'b'] assert list(mm) == ["a", "b"]
assert list(mm.items()) == [('a', 1), ('b', 2.5)] assert list(mm.items()) == [("a", 1), ("b", 2.5)]
assert str(mm) == "MapStringDouble{a: 1, b: 2.5}" assert str(mm) == "MapStringDouble{a: 1, b: 2.5}"
um = m.UnorderedMapStringDouble() um = m.UnorderedMapStringDouble()
um['ua'] = 1.1 um["ua"] = 1.1
um['ub'] = 2.6 um["ub"] = 2.6
assert sorted(list(um)) == ['ua', 'ub'] assert sorted(list(um)) == ["ua", "ub"]
assert sorted(list(um.items())) == [('ua', 1.1), ('ub', 2.6)] assert sorted(list(um.items())) == [("ua", 1.1), ("ub", 2.6)]
assert "UnorderedMapStringDouble" in str(um) assert "UnorderedMapStringDouble" in str(um)
def test_map_string_double_const(): def test_map_string_double_const():
mc = m.MapStringDoubleConst() mc = m.MapStringDoubleConst()
mc['a'] = 10 mc["a"] = 10
mc['b'] = 20.5 mc["b"] = 20.5
assert str(mc) == "MapStringDoubleConst{a: 10, b: 20.5}" assert str(mc) == "MapStringDoubleConst{a: 10, b: 20.5}"
umc = m.UnorderedMapStringDoubleConst() umc = m.UnorderedMapStringDoubleConst()
umc['a'] = 11 umc["a"] = 11
umc['b'] = 21.5 umc["b"] = 21.5
str(umc) str(umc)
...@@ -196,7 +202,7 @@ def test_noncopyable_containers(): ...@@ -196,7 +202,7 @@ def test_noncopyable_containers():
i = 1 i = 1
for j in dnc: for j in dnc:
assert(j.value == i) assert j.value == i
i += 1 i += 1
# std::map # std::map
...@@ -265,21 +271,21 @@ def test_noncopyable_containers(): ...@@ -265,21 +271,21 @@ def test_noncopyable_containers():
def test_map_delitem(): def test_map_delitem():
mm = m.MapStringDouble() mm = m.MapStringDouble()
mm['a'] = 1 mm["a"] = 1
mm['b'] = 2.5 mm["b"] = 2.5
assert list(mm) == ['a', 'b'] assert list(mm) == ["a", "b"]
assert list(mm.items()) == [('a', 1), ('b', 2.5)] assert list(mm.items()) == [("a", 1), ("b", 2.5)]
del mm['a'] del mm["a"]
assert list(mm) == ['b'] assert list(mm) == ["b"]
assert list(mm.items()) == [('b', 2.5)] assert list(mm.items()) == [("b", 2.5)]
um = m.UnorderedMapStringDouble() um = m.UnorderedMapStringDouble()
um['ua'] = 1.1 um["ua"] = 1.1
um['ub'] = 2.6 um["ub"] = 2.6
assert sorted(list(um)) == ['ua', 'ub'] assert sorted(list(um)) == ["ua", "ub"]
assert sorted(list(um.items())) == [('ua', 1.1), ('ub', 2.6)] assert sorted(list(um.items())) == [("ua", 1.1), ("ub", 2.6)]
del um['ua'] del um["ua"]
assert sorted(list(um)) == ['ub'] assert sorted(list(um)) == ["ub"]
assert sorted(list(um.items())) == [('ub', 2.6)] assert sorted(list(um.items())) == [("ub", 2.6)]
...@@ -5,16 +5,24 @@ from pybind11_tests import tagbased_polymorphic as m ...@@ -5,16 +5,24 @@ from pybind11_tests import tagbased_polymorphic as m
def test_downcast(): def test_downcast():
zoo = m.create_zoo() zoo = m.create_zoo()
assert [type(animal) for animal in zoo] == [ assert [type(animal) for animal in zoo] == [
m.Labrador, m.Dog, m.Chihuahua, m.Cat, m.Panther m.Labrador,
m.Dog,
m.Chihuahua,
m.Cat,
m.Panther,
] ]
assert [animal.name for animal in zoo] == [ assert [animal.name for animal in zoo] == [
"Fido", "Ginger", "Hertzl", "Tiger", "Leo" "Fido",
"Ginger",
"Hertzl",
"Tiger",
"Leo",
] ]
zoo[1].sound = "woooooo" zoo[1].sound = "woooooo"
assert [dog.bark() for dog in zoo[:3]] == [ assert [dog.bark() for dog in zoo[:3]] == [
"Labrador Fido goes WOOF!", "Labrador Fido goes WOOF!",
"Dog Ginger goes woooooo", "Dog Ginger goes woooooo",
"Chihuahua Hertzl goes iyiyiyiyiyi and runs in circles" "Chihuahua Hertzl goes iyiyiyiyiyi and runs in circles",
] ]
assert [cat.purr() for cat in zoo[3:]] == ["mrowr", "mrrrRRRRRR"] assert [cat.purr() for cat in zoo[3:]] == ["mrowr", "mrrrRRRRRR"]
zoo[0].excitement -= 1000 zoo[0].excitement -= 1000
......
...@@ -14,18 +14,18 @@ def test_override(capture, msg): ...@@ -14,18 +14,18 @@ def test_override(capture, msg):
self.data = "Hello world" self.data = "Hello world"
def run(self, value): def run(self, value):
print('ExtendedExampleVirt::run(%i), calling parent..' % value) print("ExtendedExampleVirt::run(%i), calling parent.." % value)
return super(ExtendedExampleVirt, self).run(value + 1) return super(ExtendedExampleVirt, self).run(value + 1)
def run_bool(self): def run_bool(self):
print('ExtendedExampleVirt::run_bool()') print("ExtendedExampleVirt::run_bool()")
return False return False
def get_string1(self): def get_string1(self):
return "override1" return "override1"
def pure_virtual(self): def pure_virtual(self):
print('ExtendedExampleVirt::pure_virtual(): %s' % self.data) print("ExtendedExampleVirt::pure_virtual(): %s" % self.data)
class ExtendedExampleVirt2(ExtendedExampleVirt): class ExtendedExampleVirt2(ExtendedExampleVirt):
def __init__(self, state): def __init__(self, state):
...@@ -37,21 +37,30 @@ def test_override(capture, msg): ...@@ -37,21 +37,30 @@ def test_override(capture, msg):
ex12 = m.ExampleVirt(10) ex12 = m.ExampleVirt(10)
with capture: with capture:
assert m.runExampleVirt(ex12, 20) == 30 assert m.runExampleVirt(ex12, 20) == 30
assert capture == """ assert (
capture
== """
Original implementation of ExampleVirt::run(state=10, value=20, str1=default1, str2=default2) Original implementation of ExampleVirt::run(state=10, value=20, str1=default1, str2=default2)
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
m.runExampleVirtVirtual(ex12) m.runExampleVirtVirtual(ex12)
assert msg(excinfo.value) == 'Tried to call pure virtual function "ExampleVirt::pure_virtual"' assert (
msg(excinfo.value)
== 'Tried to call pure virtual function "ExampleVirt::pure_virtual"'
)
ex12p = ExtendedExampleVirt(10) ex12p = ExtendedExampleVirt(10)
with capture: with capture:
assert m.runExampleVirt(ex12p, 20) == 32 assert m.runExampleVirt(ex12p, 20) == 32
assert capture == """ assert (
capture
== """
ExtendedExampleVirt::run(20), calling parent.. ExtendedExampleVirt::run(20), calling parent..
Original implementation of ExampleVirt::run(state=11, value=21, str1=override1, str2=default2) Original implementation of ExampleVirt::run(state=11, value=21, str1=override1, str2=default2)
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
with capture: with capture:
assert m.runExampleVirtBool(ex12p) is False assert m.runExampleVirtBool(ex12p) is False
assert capture == "ExtendedExampleVirt::run_bool()" assert capture == "ExtendedExampleVirt::run_bool()"
...@@ -62,16 +71,19 @@ def test_override(capture, msg): ...@@ -62,16 +71,19 @@ def test_override(capture, msg):
ex12p2 = ExtendedExampleVirt2(15) ex12p2 = ExtendedExampleVirt2(15)
with capture: with capture:
assert m.runExampleVirt(ex12p2, 50) == 68 assert m.runExampleVirt(ex12p2, 50) == 68
assert capture == """ assert (
capture
== """
ExtendedExampleVirt::run(50), calling parent.. ExtendedExampleVirt::run(50), calling parent..
Original implementation of ExampleVirt::run(state=17, value=51, str1=override1, str2=override2) Original implementation of ExampleVirt::run(state=17, value=51, str1=override1, str2=override2)
""" # noqa: E501 line too long """ # noqa: E501 line too long
)
cstats = ConstructorStats.get(m.ExampleVirt) cstats = ConstructorStats.get(m.ExampleVirt)
assert cstats.alive() == 3 assert cstats.alive() == 3
del ex12, ex12p, ex12p2 del ex12, ex12p, ex12p2
assert cstats.alive() == 0 assert cstats.alive() == 0
assert cstats.values() == ['10', '11', '17'] assert cstats.values() == ["10", "11", "17"]
assert cstats.copy_constructions == 0 assert cstats.copy_constructions == 0
assert cstats.move_constructions >= 0 assert cstats.move_constructions >= 0
...@@ -82,6 +94,7 @@ def test_alias_delay_initialization1(capture): ...@@ -82,6 +94,7 @@ def test_alias_delay_initialization1(capture):
If we just create and use an A instance directly, the trampoline initialization is If we just create and use an A instance directly, the trampoline initialization is
bypassed and we only initialize an A() instead (for performance reasons). bypassed and we only initialize an A() instead (for performance reasons).
""" """
class B(m.A): class B(m.A):
def __init__(self): def __init__(self):
super(B, self).__init__() super(B, self).__init__()
...@@ -103,12 +116,15 @@ def test_alias_delay_initialization1(capture): ...@@ -103,12 +116,15 @@ def test_alias_delay_initialization1(capture):
m.call_f(b) m.call_f(b)
del b del b
pytest.gc_collect() pytest.gc_collect()
assert capture == """ assert (
capture
== """
PyA.PyA() PyA.PyA()
PyA.f() PyA.f()
In python f() In python f()
PyA.~PyA() PyA.~PyA()
""" """
)
def test_alias_delay_initialization2(capture): def test_alias_delay_initialization2(capture):
...@@ -118,6 +134,7 @@ def test_alias_delay_initialization2(capture): ...@@ -118,6 +134,7 @@ def test_alias_delay_initialization2(capture):
performance penalty, it also allows us to do more things with the trampoline performance penalty, it also allows us to do more things with the trampoline
class such as defining local variables and performing construction/destruction. class such as defining local variables and performing construction/destruction.
""" """
class B2(m.A2): class B2(m.A2):
def __init__(self): def __init__(self):
super(B2, self).__init__() super(B2, self).__init__()
...@@ -135,7 +152,9 @@ def test_alias_delay_initialization2(capture): ...@@ -135,7 +152,9 @@ def test_alias_delay_initialization2(capture):
m.call_f(a3) m.call_f(a3)
del a3 del a3
pytest.gc_collect() pytest.gc_collect()
assert capture == """ assert (
capture
== """
PyA2.PyA2() PyA2.PyA2()
PyA2.f() PyA2.f()
A2.f() A2.f()
...@@ -145,6 +164,7 @@ def test_alias_delay_initialization2(capture): ...@@ -145,6 +164,7 @@ def test_alias_delay_initialization2(capture):
A2.f() A2.f()
PyA2.~PyA2() PyA2.~PyA2()
""" """
)
# Python subclass version # Python subclass version
with capture: with capture:
...@@ -152,20 +172,22 @@ def test_alias_delay_initialization2(capture): ...@@ -152,20 +172,22 @@ def test_alias_delay_initialization2(capture):
m.call_f(b2) m.call_f(b2)
del b2 del b2
pytest.gc_collect() pytest.gc_collect()
assert capture == """ assert (
capture
== """
PyA2.PyA2() PyA2.PyA2()
PyA2.f() PyA2.f()
In python B2.f() In python B2.f()
PyA2.~PyA2() PyA2.~PyA2()
""" """
)
# PyPy: Reference count > 1 causes call with noncopyable instance # PyPy: Reference count > 1 causes call with noncopyable instance
# to fail in ncv1.print_nc() # to fail in ncv1.print_nc()
@pytest.mark.xfail("env.PYPY") @pytest.mark.xfail("env.PYPY")
@pytest.mark.skipif( @pytest.mark.skipif(
not hasattr(m, "NCVirt"), not hasattr(m, "NCVirt"), reason="NCVirt does not work on Intel/PGI/NVCC compilers"
reason="NCVirt does not work on Intel/PGI/NVCC compilers"
) )
def test_move_support(): def test_move_support():
class NCVirtExt(m.NCVirt): class NCVirtExt(m.NCVirt):
...@@ -205,8 +227,8 @@ def test_move_support(): ...@@ -205,8 +227,8 @@ def test_move_support():
del ncv1, ncv2 del ncv1, ncv2
assert nc_stats.alive() == 0 assert nc_stats.alive() == 0
assert mv_stats.alive() == 0 assert mv_stats.alive() == 0
assert nc_stats.values() == ['4', '9', '9', '9'] assert nc_stats.values() == ["4", "9", "9", "9"]
assert mv_stats.values() == ['4', '5', '7', '7'] assert mv_stats.values() == ["4", "5", "7", "7"]
assert nc_stats.copy_constructions == 0 assert nc_stats.copy_constructions == 0
assert mv_stats.copy_constructions == 1 assert mv_stats.copy_constructions == 1
assert nc_stats.move_constructions >= 0 assert nc_stats.move_constructions >= 0
...@@ -215,6 +237,7 @@ def test_move_support(): ...@@ -215,6 +237,7 @@ def test_move_support():
def test_dispatch_issue(msg): def test_dispatch_issue(msg):
"""#159: virtual function dispatch has problems with similar-named functions""" """#159: virtual function dispatch has problems with similar-named functions"""
class PyClass1(m.DispatchIssue): class PyClass1(m.DispatchIssue):
def dispatch(self): def dispatch(self):
return "Yay.." return "Yay.."
...@@ -223,7 +246,10 @@ def test_dispatch_issue(msg): ...@@ -223,7 +246,10 @@ def test_dispatch_issue(msg):
def dispatch(self): def dispatch(self):
with pytest.raises(RuntimeError) as excinfo: with pytest.raises(RuntimeError) as excinfo:
super(PyClass2, self).dispatch() super(PyClass2, self).dispatch()
assert msg(excinfo.value) == 'Tried to call pure virtual function "Base::dispatch"' assert (
msg(excinfo.value)
== 'Tried to call pure virtual function "Base::dispatch"'
)
p = PyClass1() p = PyClass1()
return m.dispatch_issue_go(p) return m.dispatch_issue_go(p)
...@@ -339,7 +365,7 @@ def test_inherited_virtuals(): ...@@ -339,7 +365,7 @@ def test_inherited_virtuals():
class DT(m.D_Tpl): class DT(m.D_Tpl):
def say_something(self, times): def say_something(self, times):
return "DT says:" + (' quack' * times) return "DT says:" + (" quack" * times)
def unlucky_number(self): def unlucky_number(self):
return 1234 return 1234
...@@ -355,7 +381,7 @@ def test_inherited_virtuals(): ...@@ -355,7 +381,7 @@ def test_inherited_virtuals():
class DT2(DT): class DT2(DT):
def say_something(self, times): def say_something(self, times):
return "DT2: " + ('QUACK' * times) return "DT2: " + ("QUACK" * times)
def unlucky_number(self): def unlucky_number(self):
return -3 return -3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment