2020-07-20 17:35:21 +00:00
|
|
|
|
# -*- coding: utf-8 -*-
|
2017-06-08 22:44:49 +00:00
|
|
|
|
import pytest
|
|
|
|
|
|
2020-08-16 20:02:12 +00:00
|
|
|
|
import env # noqa: F401
|
2021-08-13 16:37:05 +00:00
|
|
|
|
from pybind11_tests import IncType, UserType
|
2017-06-08 22:44:49 +00:00
|
|
|
|
from pybind11_tests import builtin_casters as m
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_simple_string():
|
|
|
|
|
assert m.string_roundtrip("const char *") == "const char *"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_unicode_conversion():
|
|
|
|
|
"""Tests unicode conversion and error reporting."""
|
|
|
|
|
assert m.good_utf8_string() == u"Say utf8‽ 🎂 𝐀"
|
|
|
|
|
assert m.good_utf16_string() == u"b‽🎂𝐀z"
|
|
|
|
|
assert m.good_utf32_string() == u"a𝐀🎂‽z"
|
|
|
|
|
assert m.good_wchar_string() == u"a⸘𝐀z"
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
|
|
|
|
assert m.good_utf8_u8string() == u"Say utf8‽ 🎂 𝐀"
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
|
m.bad_utf8_string()
|
|
|
|
|
|
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
|
m.bad_utf16_string()
|
|
|
|
|
|
|
|
|
|
# These are provided only if they actually fail (they don't when 32-bit and under Python 2.7)
|
|
|
|
|
if hasattr(m, "bad_utf32_string"):
|
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
|
m.bad_utf32_string()
|
|
|
|
|
if hasattr(m, "bad_wchar_string"):
|
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
|
m.bad_wchar_string()
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
|
|
|
|
with pytest.raises(UnicodeDecodeError):
|
|
|
|
|
m.bad_utf8_u8string()
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.u8_Z() == "Z"
|
|
|
|
|
assert m.u8_eacute() == u"é"
|
|
|
|
|
assert m.u16_ibang() == u"‽"
|
|
|
|
|
assert m.u32_mathbfA() == u"𝐀"
|
|
|
|
|
assert m.wchar_heart() == u"♥"
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.u8_char8_Z() == "Z"
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_single_char_arguments():
|
|
|
|
|
"""Tests failures for passing invalid inputs to char-accepting functions"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
def toobig_message(r):
|
2021-07-12 19:01:19 +00:00
|
|
|
|
return "Character code point not in range({:#x})".format(r)
|
2020-10-16 20:38:13 +00:00
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
toolong_message = "Expected a character, but multi-character string found"
|
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char(u"a") == 0x61 # simple ASCII
|
|
|
|
|
assert m.ord_char_lv(u"b") == 0x62
|
|
|
|
|
assert (
|
|
|
|
|
m.ord_char(u"é") == 0xE9
|
|
|
|
|
) # requires 2 bytes in utf-8, but can be stuffed in a char
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char(u"Ā") == 0x100 # requires 2 bytes, doesn't fit in a char
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toobig_message(0x100)
|
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char(u"ab")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char16(u"a") == 0x61
|
|
|
|
|
assert m.ord_char16(u"é") == 0xE9
|
|
|
|
|
assert m.ord_char16_lv(u"ê") == 0xEA
|
|
|
|
|
assert m.ord_char16(u"Ā") == 0x100
|
|
|
|
|
assert m.ord_char16(u"‽") == 0x203D
|
|
|
|
|
assert m.ord_char16(u"♥") == 0x2665
|
|
|
|
|
assert m.ord_char16_lv(u"♡") == 0x2661
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char16(u"🎂") == 0x1F382 # requires surrogate pair
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toobig_message(0x10000)
|
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char16(u"aa")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char32(u"a") == 0x61
|
|
|
|
|
assert m.ord_char32(u"é") == 0xE9
|
|
|
|
|
assert m.ord_char32(u"Ā") == 0x100
|
|
|
|
|
assert m.ord_char32(u"‽") == 0x203D
|
|
|
|
|
assert m.ord_char32(u"♥") == 0x2665
|
|
|
|
|
assert m.ord_char32(u"🎂") == 0x1F382
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char32(u"aa")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_wchar(u"a") == 0x61
|
|
|
|
|
assert m.ord_wchar(u"é") == 0xE9
|
|
|
|
|
assert m.ord_wchar(u"Ā") == 0x100
|
|
|
|
|
assert m.ord_wchar(u"‽") == 0x203D
|
|
|
|
|
assert m.ord_wchar(u"♥") == 0x2665
|
2017-06-08 22:44:49 +00:00
|
|
|
|
if m.wchar_size == 2:
|
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_wchar(u"🎂") == 0x1F382 # requires surrogate pair
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toobig_message(0x10000)
|
|
|
|
|
else:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_wchar(u"🎂") == 0x1F382
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_wchar(u"aa")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char8(u"a") == 0x61 # simple ASCII
|
|
|
|
|
assert m.ord_char8_lv(u"b") == 0x62
|
|
|
|
|
assert (
|
|
|
|
|
m.ord_char8(u"é") == 0xE9
|
|
|
|
|
) # requires 2 bytes in utf-8, but can be stuffed in a char
|
2019-12-19 11:16:24 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char8(u"Ā") == 0x100 # requires 2 bytes, doesn't fit in a char
|
2019-12-19 11:16:24 +00:00
|
|
|
|
assert str(excinfo.value) == toobig_message(0x100)
|
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.ord_char8(u"ab")
|
2019-12-19 11:16:24 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
def test_bytes_to_string():
|
|
|
|
|
"""Tests the ability to pass bytes to C++ string-accepting functions. Note that this is
|
|
|
|
|
one-way: the only way to return bytes to Python is via the pybind11::bytes class."""
|
|
|
|
|
# Issue #816
|
|
|
|
|
|
2020-08-14 18:03:43 +00:00
|
|
|
|
def to_bytes(s):
|
2020-08-16 20:02:12 +00:00
|
|
|
|
b = s if env.PY2 else s.encode("utf8")
|
2020-08-14 18:03:43 +00:00
|
|
|
|
assert isinstance(b, bytes)
|
|
|
|
|
return b
|
|
|
|
|
|
|
|
|
|
assert m.strlen(to_bytes("hi")) == 2
|
|
|
|
|
assert m.string_length(to_bytes("world")) == 5
|
|
|
|
|
assert m.string_length(to_bytes("a\x00b")) == 3
|
|
|
|
|
assert m.strlen(to_bytes("a\x00b")) == 1 # C-string limitation
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
# passing in a utf8 encoded string should work
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.string_length(u"💩".encode("utf8")) == 4
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.skipif(not hasattr(m, "has_string_view"), reason="no <string_view>")
|
|
|
|
|
def test_string_view(capture):
|
|
|
|
|
"""Tests support for C++17 string_view arguments and return values"""
|
|
|
|
|
assert m.string_view_chars("Hi") == [72, 105]
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.string_view_chars("Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
|
|
|
|
|
assert m.string_view16_chars(u"Hi 🎂") == [72, 105, 32, 0xD83C, 0xDF82]
|
2020-07-22 19:05:16 +00:00
|
|
|
|
assert m.string_view32_chars(u"Hi 🎂") == [72, 105, 32, 127874]
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
|
|
|
|
assert m.string_view8_chars("Hi") == [72, 105]
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert m.string_view8_chars(u"Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2020-07-22 19:05:16 +00:00
|
|
|
|
assert m.string_view_return() == u"utf8 secret 🎂"
|
|
|
|
|
assert m.string_view16_return() == u"utf16 secret 🎂"
|
|
|
|
|
assert m.string_view32_return() == u"utf32 secret 🎂"
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2020-07-22 19:05:16 +00:00
|
|
|
|
assert m.string_view8_return() == u"utf8 secret 🎂"
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
with capture:
|
|
|
|
|
m.string_view_print("Hi")
|
|
|
|
|
m.string_view_print("utf8 🎂")
|
2020-07-22 19:05:16 +00:00
|
|
|
|
m.string_view16_print(u"utf16 🎂")
|
|
|
|
|
m.string_view32_print(u"utf32 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
|
|
|
|
== u"""
|
2017-06-08 22:44:49 +00:00
|
|
|
|
Hi 2
|
|
|
|
|
utf8 🎂 9
|
|
|
|
|
utf16 🎂 8
|
|
|
|
|
utf32 🎂 7
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
|
|
|
|
with capture:
|
|
|
|
|
m.string_view8_print("Hi")
|
2020-07-22 19:05:16 +00:00
|
|
|
|
m.string_view8_print(u"utf8 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
|
|
|
|
== u"""
|
2019-12-19 11:16:24 +00:00
|
|
|
|
Hi 2
|
|
|
|
|
utf8 🎂 9
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
with capture:
|
|
|
|
|
m.string_view_print("Hi, ascii")
|
|
|
|
|
m.string_view_print("Hi, utf8 🎂")
|
2020-07-22 19:05:16 +00:00
|
|
|
|
m.string_view16_print(u"Hi, utf16 🎂")
|
|
|
|
|
m.string_view32_print(u"Hi, utf32 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
|
|
|
|
== u"""
|
2017-06-08 22:44:49 +00:00
|
|
|
|
Hi, ascii 9
|
|
|
|
|
Hi, utf8 🎂 13
|
|
|
|
|
Hi, utf16 🎂 12
|
|
|
|
|
Hi, utf32 🎂 11
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
|
|
|
|
with capture:
|
|
|
|
|
m.string_view8_print("Hi, ascii")
|
2020-07-22 19:05:16 +00:00
|
|
|
|
m.string_view8_print(u"Hi, utf8 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
|
|
|
|
== u"""
|
2019-12-19 11:16:24 +00:00
|
|
|
|
Hi, ascii 9
|
|
|
|
|
Hi, utf8 🎂 13
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
|
Fix unsigned error value casting
When casting to an unsigned type from a python 2 `int`, we currently
cast using `(unsigned long long) PyLong_AsUnsignedLong(src.ptr())`.
If the Python cast fails, it returns (unsigned long) -1, but then we
cast this to `unsigned long long`, which means we get 4294967295, but
because that isn't equal to `(unsigned long long) -1`, we don't detect
the failure.
This commit moves the unsigned casting into a `detail::as_unsigned`
function which, upon error, casts -1 to the final type, and otherwise
casts the return value to the final type to avoid the problematic double
cast when an error occurs.
The error most commonly shows up wherever `long` is 32-bits (e.g. under
both 32- and 64-bit Windows, and under 32-bit linux) when passing a
negative value to a bound function taking an `unsigned long`.
Fixes #929.
The added tests also trigger a latent segfault under PyPy: when casting
to an integer smaller than `long` (e.g. casting to a `uint32_t` on a
64-bit `long` architecture) we check both for a Python error and also
that the resulting intermediate value will fit in the final type. If
there is no conversion error, but we get a value that would overflow, we
end up calling `PyErr_ExceptionMatches()` illegally: that call is only
allowed when there is a current exception. Under PyPy, this segfaults
the test suite. It doesn't appear to segfault under CPython, but the
documentation suggests that it *could* do so. The fix is to only check
for the exception match if we actually got an error.
2017-07-01 20:31:49 +00:00
|
|
|
|
def test_integer_casting():
|
|
|
|
|
"""Issue #929 - out-of-range integer values shouldn't be accepted"""
|
|
|
|
|
assert m.i32_str(-1) == "-1"
|
|
|
|
|
assert m.i64_str(-1) == "-1"
|
|
|
|
|
assert m.i32_str(2000000000) == "2000000000"
|
|
|
|
|
assert m.u32_str(2000000000) == "2000000000"
|
2020-08-16 20:02:12 +00:00
|
|
|
|
if env.PY2:
|
2017-07-26 01:46:54 +00:00
|
|
|
|
assert m.i32_str(long(-1)) == "-1" # noqa: F821 undefined name 'long'
|
|
|
|
|
assert m.i64_str(long(-1)) == "-1" # noqa: F821 undefined name 'long'
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
m.i64_str(long(-999999999999)) # noqa: F821 undefined name 'long'
|
|
|
|
|
== "-999999999999"
|
|
|
|
|
)
|
|
|
|
|
assert (
|
|
|
|
|
m.u64_str(long(999999999999)) # noqa: F821 undefined name 'long'
|
|
|
|
|
== "999999999999"
|
|
|
|
|
)
|
Fix unsigned error value casting
When casting to an unsigned type from a python 2 `int`, we currently
cast using `(unsigned long long) PyLong_AsUnsignedLong(src.ptr())`.
If the Python cast fails, it returns (unsigned long) -1, but then we
cast this to `unsigned long long`, which means we get 4294967295, but
because that isn't equal to `(unsigned long long) -1`, we don't detect
the failure.
This commit moves the unsigned casting into a `detail::as_unsigned`
function which, upon error, casts -1 to the final type, and otherwise
casts the return value to the final type to avoid the problematic double
cast when an error occurs.
The error most commonly shows up wherever `long` is 32-bits (e.g. under
both 32- and 64-bit Windows, and under 32-bit linux) when passing a
negative value to a bound function taking an `unsigned long`.
Fixes #929.
The added tests also trigger a latent segfault under PyPy: when casting
to an integer smaller than `long` (e.g. casting to a `uint32_t` on a
64-bit `long` architecture) we check both for a Python error and also
that the resulting intermediate value will fit in the final type. If
there is no conversion error, but we get a value that would overflow, we
end up calling `PyErr_ExceptionMatches()` illegally: that call is only
allowed when there is a current exception. Under PyPy, this segfaults
the test suite. It doesn't appear to segfault under CPython, but the
documentation suggests that it *could* do so. The fix is to only check
for the exception match if we actually got an error.
2017-07-01 20:31:49 +00:00
|
|
|
|
else:
|
|
|
|
|
assert m.i64_str(-999999999999) == "-999999999999"
|
|
|
|
|
assert m.u64_str(999999999999) == "999999999999"
|
|
|
|
|
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.u32_str(-1)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.u64_str(-1)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.i32_str(-3000000000)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.i32_str(3000000000)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
|
2020-08-16 20:02:12 +00:00
|
|
|
|
if env.PY2:
|
Fix unsigned error value casting
When casting to an unsigned type from a python 2 `int`, we currently
cast using `(unsigned long long) PyLong_AsUnsignedLong(src.ptr())`.
If the Python cast fails, it returns (unsigned long) -1, but then we
cast this to `unsigned long long`, which means we get 4294967295, but
because that isn't equal to `(unsigned long long) -1`, we don't detect
the failure.
This commit moves the unsigned casting into a `detail::as_unsigned`
function which, upon error, casts -1 to the final type, and otherwise
casts the return value to the final type to avoid the problematic double
cast when an error occurs.
The error most commonly shows up wherever `long` is 32-bits (e.g. under
both 32- and 64-bit Windows, and under 32-bit linux) when passing a
negative value to a bound function taking an `unsigned long`.
Fixes #929.
The added tests also trigger a latent segfault under PyPy: when casting
to an integer smaller than `long` (e.g. casting to a `uint32_t` on a
64-bit `long` architecture) we check both for a Python error and also
that the resulting intermediate value will fit in the final type. If
there is no conversion error, but we get a value that would overflow, we
end up calling `PyErr_ExceptionMatches()` illegally: that call is only
allowed when there is a current exception. Under PyPy, this segfaults
the test suite. It doesn't appear to segfault under CPython, but the
documentation suggests that it *could* do so. The fix is to only check
for the exception match if we actually got an error.
2017-07-01 20:31:49 +00:00
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
2017-07-26 01:46:54 +00:00
|
|
|
|
m.u32_str(long(-1)) # noqa: F821 undefined name 'long'
|
Fix unsigned error value casting
When casting to an unsigned type from a python 2 `int`, we currently
cast using `(unsigned long long) PyLong_AsUnsignedLong(src.ptr())`.
If the Python cast fails, it returns (unsigned long) -1, but then we
cast this to `unsigned long long`, which means we get 4294967295, but
because that isn't equal to `(unsigned long long) -1`, we don't detect
the failure.
This commit moves the unsigned casting into a `detail::as_unsigned`
function which, upon error, casts -1 to the final type, and otherwise
casts the return value to the final type to avoid the problematic double
cast when an error occurs.
The error most commonly shows up wherever `long` is 32-bits (e.g. under
both 32- and 64-bit Windows, and under 32-bit linux) when passing a
negative value to a bound function taking an `unsigned long`.
Fixes #929.
The added tests also trigger a latent segfault under PyPy: when casting
to an integer smaller than `long` (e.g. casting to a `uint32_t` on a
64-bit `long` architecture) we check both for a Python error and also
that the resulting intermediate value will fit in the final type. If
there is no conversion error, but we get a value that would overflow, we
end up calling `PyErr_ExceptionMatches()` illegally: that call is only
allowed when there is a current exception. Under PyPy, this segfaults
the test suite. It doesn't appear to segfault under CPython, but the
documentation suggests that it *could* do so. The fix is to only check
for the exception match if we actually got an error.
2017-07-01 20:31:49 +00:00
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
2017-07-26 01:46:54 +00:00
|
|
|
|
m.u64_str(long(-1)) # noqa: F821 undefined name 'long'
|
Fix unsigned error value casting
When casting to an unsigned type from a python 2 `int`, we currently
cast using `(unsigned long long) PyLong_AsUnsignedLong(src.ptr())`.
If the Python cast fails, it returns (unsigned long) -1, but then we
cast this to `unsigned long long`, which means we get 4294967295, but
because that isn't equal to `(unsigned long long) -1`, we don't detect
the failure.
This commit moves the unsigned casting into a `detail::as_unsigned`
function which, upon error, casts -1 to the final type, and otherwise
casts the return value to the final type to avoid the problematic double
cast when an error occurs.
The error most commonly shows up wherever `long` is 32-bits (e.g. under
both 32- and 64-bit Windows, and under 32-bit linux) when passing a
negative value to a bound function taking an `unsigned long`.
Fixes #929.
The added tests also trigger a latent segfault under PyPy: when casting
to an integer smaller than `long` (e.g. casting to a `uint32_t` on a
64-bit `long` architecture) we check both for a Python error and also
that the resulting intermediate value will fit in the final type. If
there is no conversion error, but we get a value that would overflow, we
end up calling `PyErr_ExceptionMatches()` illegally: that call is only
allowed when there is a current exception. Under PyPy, this segfaults
the test suite. It doesn't appear to segfault under CPython, but the
documentation suggests that it *could* do so. The fix is to only check
for the exception match if we actually got an error.
2017-07-01 20:31:49 +00:00
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
|
|
|
|
|
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def test_int_convert():
|
2021-01-25 20:05:17 +00:00
|
|
|
|
class Int(object):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
2021-01-25 20:05:17 +00:00
|
|
|
|
class NotInt(object):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
pass
|
|
|
|
|
|
2021-01-25 20:05:17 +00:00
|
|
|
|
class Float(object):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __float__(self):
|
|
|
|
|
return 41.99999
|
|
|
|
|
|
2021-01-25 20:05:17 +00:00
|
|
|
|
class Index(object):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __index__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
2021-01-25 20:05:17 +00:00
|
|
|
|
class IntAndIndex(object):
|
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
|
|
|
|
def __index__(self):
|
|
|
|
|
return 0
|
|
|
|
|
|
|
|
|
|
class RaisingTypeErrorOnIndex(object):
|
|
|
|
|
def __index__(self):
|
|
|
|
|
raise TypeError
|
|
|
|
|
|
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
|
|
|
|
class RaisingValueErrorOnIndex(object):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __index__(self):
|
|
|
|
|
raise ValueError
|
|
|
|
|
|
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
|
|
|
|
convert, noconvert = m.int_passthrough, m.int_passthrough_noconvert
|
|
|
|
|
|
2021-01-25 20:05:17 +00:00
|
|
|
|
def requires_conversion(v):
|
2021-01-17 01:52:14 +00:00
|
|
|
|
pytest.raises(TypeError, noconvert, v)
|
|
|
|
|
|
|
|
|
|
def cant_convert(v):
|
|
|
|
|
pytest.raises(TypeError, convert, v)
|
|
|
|
|
|
|
|
|
|
assert convert(7) == 7
|
|
|
|
|
assert noconvert(7) == 7
|
|
|
|
|
cant_convert(3.14159)
|
2021-02-01 13:52:20 +00:00
|
|
|
|
# TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
|
|
|
|
|
if (3, 8) <= env.PY < (3, 10):
|
2021-04-02 18:34:09 +00:00
|
|
|
|
with env.deprecated_call():
|
2021-02-01 13:52:20 +00:00
|
|
|
|
assert convert(Int()) == 42
|
|
|
|
|
else:
|
|
|
|
|
assert convert(Int()) == 42
|
2021-01-25 20:05:17 +00:00
|
|
|
|
requires_conversion(Int())
|
|
|
|
|
cant_convert(NotInt())
|
|
|
|
|
cant_convert(Float())
|
|
|
|
|
|
|
|
|
|
# Before Python 3.8, `PyLong_AsLong` does not pick up on `obj.__index__`,
|
|
|
|
|
# but pybind11 "backports" this behavior.
|
|
|
|
|
assert convert(Index()) == 42
|
|
|
|
|
assert noconvert(Index()) == 42
|
|
|
|
|
assert convert(IntAndIndex()) == 0 # Fishy; `int(DoubleThought)` == 42
|
|
|
|
|
assert noconvert(IntAndIndex()) == 0
|
|
|
|
|
assert convert(RaisingTypeErrorOnIndex()) == 42
|
|
|
|
|
requires_conversion(RaisingTypeErrorOnIndex())
|
|
|
|
|
assert convert(RaisingValueErrorOnIndex()) == 42
|
|
|
|
|
requires_conversion(RaisingValueErrorOnIndex())
|
2021-01-17 01:52:14 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_numpy_int_convert():
|
|
|
|
|
np = pytest.importorskip("numpy")
|
|
|
|
|
|
|
|
|
|
convert, noconvert = m.int_passthrough, m.int_passthrough_noconvert
|
|
|
|
|
|
|
|
|
|
def require_implicit(v):
|
|
|
|
|
pytest.raises(TypeError, noconvert, v)
|
|
|
|
|
|
|
|
|
|
# `np.intc` is an alias that corresponds to a C++ `int`
|
|
|
|
|
assert convert(np.intc(42)) == 42
|
|
|
|
|
assert noconvert(np.intc(42)) == 42
|
|
|
|
|
|
|
|
|
|
# The implicit conversion from np.float32 is undesirable but currently accepted.
|
2021-02-01 13:52:20 +00:00
|
|
|
|
# TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
|
|
|
|
|
if (3, 8) <= env.PY < (3, 10):
|
2021-04-02 18:34:09 +00:00
|
|
|
|
with env.deprecated_call():
|
2021-02-01 13:52:20 +00:00
|
|
|
|
assert convert(np.float32(3.14159)) == 3
|
|
|
|
|
else:
|
|
|
|
|
assert convert(np.float32(3.14159)) == 3
|
2021-01-17 01:52:14 +00:00
|
|
|
|
require_implicit(np.float32(3.14159))
|
|
|
|
|
|
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
def test_tuple(doc):
|
|
|
|
|
"""std::pair <-> tuple & std::tuple <-> tuple"""
|
|
|
|
|
assert m.pair_passthrough((True, "test")) == ("test", True)
|
|
|
|
|
assert m.tuple_passthrough((True, "test", 5)) == (5, "test", True)
|
|
|
|
|
# Any sequence can be cast to a std::pair or std::tuple
|
|
|
|
|
assert m.pair_passthrough([True, "test"]) == ("test", True)
|
|
|
|
|
assert m.tuple_passthrough([True, "test", 5]) == (5, "test", True)
|
2017-07-04 18:57:41 +00:00
|
|
|
|
assert m.empty_tuple() == ()
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
doc(m.pair_passthrough)
|
|
|
|
|
== """
|
2017-06-08 22:44:49 +00:00
|
|
|
|
pair_passthrough(arg0: Tuple[bool, str]) -> Tuple[str, bool]
|
|
|
|
|
|
|
|
|
|
Return a pair in reversed order
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
|
|
|
|
assert (
|
|
|
|
|
doc(m.tuple_passthrough)
|
|
|
|
|
== """
|
2017-06-08 22:44:49 +00:00
|
|
|
|
tuple_passthrough(arg0: Tuple[bool, str, int]) -> Tuple[int, str, bool]
|
|
|
|
|
|
|
|
|
|
Return a triple in reversed order
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2017-07-03 23:12:09 +00:00
|
|
|
|
assert m.rvalue_pair() == ("rvalue", "rvalue")
|
|
|
|
|
assert m.lvalue_pair() == ("lvalue", "lvalue")
|
|
|
|
|
assert m.rvalue_tuple() == ("rvalue", "rvalue", "rvalue")
|
|
|
|
|
assert m.lvalue_tuple() == ("lvalue", "lvalue", "lvalue")
|
|
|
|
|
assert m.rvalue_nested() == ("rvalue", ("rvalue", ("rvalue", "rvalue")))
|
|
|
|
|
assert m.lvalue_nested() == ("lvalue", ("lvalue", ("lvalue", "lvalue")))
|
|
|
|
|
|
2020-07-28 19:44:19 +00:00
|
|
|
|
assert m.int_string_pair() == (2, "items")
|
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
def test_builtins_cast_return_none():
|
|
|
|
|
"""Casters produced with PYBIND11_TYPE_CASTER() should convert nullptr to None"""
|
|
|
|
|
assert m.return_none_string() is None
|
|
|
|
|
assert m.return_none_char() is None
|
|
|
|
|
assert m.return_none_bool() is None
|
|
|
|
|
assert m.return_none_int() is None
|
|
|
|
|
assert m.return_none_float() is None
|
2020-07-28 19:44:19 +00:00
|
|
|
|
assert m.return_none_pair() is None
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_none_deferred():
|
|
|
|
|
"""None passed as various argument types should defer to other overloads"""
|
|
|
|
|
assert not m.defer_none_cstring("abc")
|
|
|
|
|
assert m.defer_none_cstring(None)
|
|
|
|
|
assert not m.defer_none_custom(UserType())
|
|
|
|
|
assert m.defer_none_custom(None)
|
|
|
|
|
assert m.nodefer_none_void(None)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_void_caster():
|
|
|
|
|
assert m.load_nullptr_t(None) is None
|
|
|
|
|
assert m.cast_nullptr_t() is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_reference_wrapper():
|
|
|
|
|
"""std::reference_wrapper for builtin and user types"""
|
|
|
|
|
assert m.refwrap_builtin(42) == 420
|
|
|
|
|
assert m.refwrap_usertype(UserType(42)) == 42
|
Adjusting `type_caster<std::reference_wrapper<T>>` to support const/non-const propagation in `cast_op`. (#2705)
* Allow type_caster of std::reference_wrapper<T> to be the same as a native reference.
Before, both std::reference_wrapper<T> and std::reference_wrapper<const T> would
invoke cast_op<type>. This doesn't allow the type_caster<> specialization for T
to distinguish reference_wrapper types from value types.
After, the type_caster<> specialization invokes cast_op<type&>, which allows
reference_wrapper to behave in the same way as a native reference type.
* Add tests/examples for std::reference_wrapper<const T>
* Add tests which use mutable/immutable variants
This test is a chimera; it blends the pybind11 casters with a custom
pytype implementation that supports immutable and mutable calls.
In order to detect the immutable/mutable state, the cast_op needs
to propagate it, even through e.g. std::reference<const T>
Note: This is still a work in progress; some things are crashing,
which likely means that I have a refcounting bug or something else
missing.
* Add/finish tests that distinguish const& from &
Fixes the bugs in my custom python type implementation,
demonstrate test that requires const& and reference_wrapper<const T>
being treated differently from Non-const.
* Add passing a const to non-const method.
* Demonstrate non-const conversion of reference_wrapper in tests.
Apply formatting presubmit check.
* Fix build errors from presubmit checks.
* Try and fix a few more CI errors
* More CI fixes.
* More CI fixups.
* Try and get PyPy to work.
* Additional minor fixups. Getting close to CI green.
* More ci fixes?
* fix clang-tidy warnings from presubmit
* fix more clang-tidy warnings
* minor comment and consistency cleanups
* PyDECREF -> Py_DECREF
* copy/move constructors
* Resolve codereview comments
* more review comment fixes
* review comments: remove spurious &
* Make the test fail even when the static_assert is commented out.
This expands the test_freezable_type_caster a bit by:
1/ adding accessors .is_immutable and .addr to compare identity
from python.
2/ Changing the default cast_op of the type_caster<> specialization
to return a non-const value. In normal codepaths this is a reasonable
default.
3/ adding roundtrip variants to exercise the by reference, by pointer
and by reference_wrapper in all call paths. In conjunction with 2/, this
demonstrates the failure case of the existing std::reference_wrpper conversion,
which now loses const in a similar way that happens when using the default cast_op_type<>.
* apply presubmit formatting
* Revert inclusion of test_freezable_type_caster
There's some concern that this test is a bit unwieldly because of the use
of the raw <Python.h> functions. Removing for now.
* Add a test that validates const references propagation.
This test verifies that cast_op may be used to correctly detect
const reference types when used with std::reference_wrapper.
* mend
* Review comments based changes.
1. std::add_lvalue_reference<type> -> type&
2. Simplify the test a little more; we're never returning the ConstRefCaster
type so the class_ definition can be removed.
* formatted files again.
* Move const_ref_caster test to builtin_casters
* Review comments: use cast_op and adjust some comments.
* Simplify ConstRefCasted test
I like this version better as it moves the assertion that matters
back into python.
2020-12-16 00:53:55 +00:00
|
|
|
|
assert m.refwrap_usertype_const(UserType(42)) == 42
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.refwrap_builtin(None)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
|
|
|
|
|
with pytest.raises(TypeError) as excinfo:
|
|
|
|
|
m.refwrap_usertype(None)
|
|
|
|
|
assert "incompatible function arguments" in str(excinfo.value)
|
|
|
|
|
|
Adjusting `type_caster<std::reference_wrapper<T>>` to support const/non-const propagation in `cast_op`. (#2705)
* Allow type_caster of std::reference_wrapper<T> to be the same as a native reference.
Before, both std::reference_wrapper<T> and std::reference_wrapper<const T> would
invoke cast_op<type>. This doesn't allow the type_caster<> specialization for T
to distinguish reference_wrapper types from value types.
After, the type_caster<> specialization invokes cast_op<type&>, which allows
reference_wrapper to behave in the same way as a native reference type.
* Add tests/examples for std::reference_wrapper<const T>
* Add tests which use mutable/immutable variants
This test is a chimera; it blends the pybind11 casters with a custom
pytype implementation that supports immutable and mutable calls.
In order to detect the immutable/mutable state, the cast_op needs
to propagate it, even through e.g. std::reference<const T>
Note: This is still a work in progress; some things are crashing,
which likely means that I have a refcounting bug or something else
missing.
* Add/finish tests that distinguish const& from &
Fixes the bugs in my custom python type implementation,
demonstrate test that requires const& and reference_wrapper<const T>
being treated differently from Non-const.
* Add passing a const to non-const method.
* Demonstrate non-const conversion of reference_wrapper in tests.
Apply formatting presubmit check.
* Fix build errors from presubmit checks.
* Try and fix a few more CI errors
* More CI fixes.
* More CI fixups.
* Try and get PyPy to work.
* Additional minor fixups. Getting close to CI green.
* More ci fixes?
* fix clang-tidy warnings from presubmit
* fix more clang-tidy warnings
* minor comment and consistency cleanups
* PyDECREF -> Py_DECREF
* copy/move constructors
* Resolve codereview comments
* more review comment fixes
* review comments: remove spurious &
* Make the test fail even when the static_assert is commented out.
This expands the test_freezable_type_caster a bit by:
1/ adding accessors .is_immutable and .addr to compare identity
from python.
2/ Changing the default cast_op of the type_caster<> specialization
to return a non-const value. In normal codepaths this is a reasonable
default.
3/ adding roundtrip variants to exercise the by reference, by pointer
and by reference_wrapper in all call paths. In conjunction with 2/, this
demonstrates the failure case of the existing std::reference_wrpper conversion,
which now loses const in a similar way that happens when using the default cast_op_type<>.
* apply presubmit formatting
* Revert inclusion of test_freezable_type_caster
There's some concern that this test is a bit unwieldly because of the use
of the raw <Python.h> functions. Removing for now.
* Add a test that validates const references propagation.
This test verifies that cast_op may be used to correctly detect
const reference types when used with std::reference_wrapper.
* mend
* Review comments based changes.
1. std::add_lvalue_reference<type> -> type&
2. Simplify the test a little more; we're never returning the ConstRefCaster
type so the class_ definition can be removed.
* formatted files again.
* Move const_ref_caster test to builtin_casters
* Review comments: use cast_op and adjust some comments.
* Simplify ConstRefCasted test
I like this version better as it moves the assertion that matters
back into python.
2020-12-16 00:53:55 +00:00
|
|
|
|
assert m.refwrap_lvalue().value == 1
|
|
|
|
|
assert m.refwrap_lvalue_const().value == 1
|
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
a1 = m.refwrap_list(copy=True)
|
|
|
|
|
a2 = m.refwrap_list(copy=True)
|
|
|
|
|
assert [x.value for x in a1] == [2, 3]
|
|
|
|
|
assert [x.value for x in a2] == [2, 3]
|
|
|
|
|
assert not a1[0] is a2[0] and not a1[1] is a2[1]
|
|
|
|
|
|
|
|
|
|
b1 = m.refwrap_list(copy=False)
|
|
|
|
|
b2 = m.refwrap_list(copy=False)
|
|
|
|
|
assert [x.value for x in b1] == [1, 2]
|
|
|
|
|
assert [x.value for x in b2] == [1, 2]
|
|
|
|
|
assert b1[0] is b2[0] and b1[1] is b2[1]
|
|
|
|
|
|
|
|
|
|
assert m.refwrap_iiw(IncType(5)) == 5
|
|
|
|
|
assert m.refwrap_call_iiw(IncType(10), m.refwrap_iiw) == [10, 10, 10, 10]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_complex_cast():
|
|
|
|
|
"""std::complex casts"""
|
|
|
|
|
assert m.complex_cast(1) == "1.0"
|
|
|
|
|
assert m.complex_cast(2j) == "(0.0, 2.0)"
|
2017-07-23 15:02:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_bool_caster():
|
|
|
|
|
"""Test bool caster implicit conversions."""
|
|
|
|
|
convert, noconvert = m.bool_passthrough, m.bool_passthrough_noconvert
|
|
|
|
|
|
|
|
|
|
def require_implicit(v):
|
|
|
|
|
pytest.raises(TypeError, noconvert, v)
|
|
|
|
|
|
|
|
|
|
def cant_convert(v):
|
|
|
|
|
pytest.raises(TypeError, convert, v)
|
|
|
|
|
|
|
|
|
|
# straight up bool
|
|
|
|
|
assert convert(True) is True
|
|
|
|
|
assert convert(False) is False
|
|
|
|
|
assert noconvert(True) is True
|
|
|
|
|
assert noconvert(False) is False
|
|
|
|
|
|
|
|
|
|
# None requires implicit conversion
|
|
|
|
|
require_implicit(None)
|
|
|
|
|
assert convert(None) is False
|
|
|
|
|
|
|
|
|
|
class A(object):
|
|
|
|
|
def __init__(self, x):
|
|
|
|
|
self.x = x
|
|
|
|
|
|
|
|
|
|
def __nonzero__(self):
|
|
|
|
|
return self.x
|
|
|
|
|
|
|
|
|
|
def __bool__(self):
|
|
|
|
|
return self.x
|
|
|
|
|
|
|
|
|
|
class B(object):
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
# Arbitrary objects are not accepted
|
|
|
|
|
cant_convert(object())
|
|
|
|
|
cant_convert(B())
|
|
|
|
|
|
|
|
|
|
# Objects with __nonzero__ / __bool__ defined can be converted
|
|
|
|
|
require_implicit(A(True))
|
|
|
|
|
assert convert(A(True)) is True
|
|
|
|
|
assert convert(A(False)) is False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_numpy_bool():
|
2020-08-16 20:02:12 +00:00
|
|
|
|
np = pytest.importorskip("numpy")
|
|
|
|
|
|
2017-07-23 15:02:43 +00:00
|
|
|
|
convert, noconvert = m.bool_passthrough, m.bool_passthrough_noconvert
|
|
|
|
|
|
2019-11-14 07:55:34 +00:00
|
|
|
|
def cant_convert(v):
|
|
|
|
|
pytest.raises(TypeError, convert, v)
|
|
|
|
|
|
2017-07-23 15:02:43 +00:00
|
|
|
|
# np.bool_ is not considered implicit
|
|
|
|
|
assert convert(np.bool_(True)) is True
|
|
|
|
|
assert convert(np.bool_(False)) is False
|
|
|
|
|
assert noconvert(np.bool_(True)) is True
|
|
|
|
|
assert noconvert(np.bool_(False)) is False
|
2020-10-16 20:38:13 +00:00
|
|
|
|
cant_convert(np.zeros(2, dtype="int"))
|
2017-11-30 17:33:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_int_long():
|
|
|
|
|
"""In Python 2, a C++ int should return a Python int rather than long
|
|
|
|
|
if possible: longs are not always accepted where ints are used (such
|
|
|
|
|
as the argument to sys.exit()). A C++ long long is always a Python
|
|
|
|
|
long."""
|
|
|
|
|
|
|
|
|
|
import sys
|
2020-10-16 20:38:13 +00:00
|
|
|
|
|
|
|
|
|
must_be_long = type(getattr(sys, "maxint", 1) + 1)
|
2017-11-30 17:33:24 +00:00
|
|
|
|
assert isinstance(m.int_cast(), int)
|
|
|
|
|
assert isinstance(m.long_cast(), int)
|
|
|
|
|
assert isinstance(m.longlong_cast(), must_be_long)
|
2018-11-11 18:32:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_void_caster_2():
|
|
|
|
|
assert m.test_void_caster()
|
Adjusting `type_caster<std::reference_wrapper<T>>` to support const/non-const propagation in `cast_op`. (#2705)
* Allow type_caster of std::reference_wrapper<T> to be the same as a native reference.
Before, both std::reference_wrapper<T> and std::reference_wrapper<const T> would
invoke cast_op<type>. This doesn't allow the type_caster<> specialization for T
to distinguish reference_wrapper types from value types.
After, the type_caster<> specialization invokes cast_op<type&>, which allows
reference_wrapper to behave in the same way as a native reference type.
* Add tests/examples for std::reference_wrapper<const T>
* Add tests which use mutable/immutable variants
This test is a chimera; it blends the pybind11 casters with a custom
pytype implementation that supports immutable and mutable calls.
In order to detect the immutable/mutable state, the cast_op needs
to propagate it, even through e.g. std::reference<const T>
Note: This is still a work in progress; some things are crashing,
which likely means that I have a refcounting bug or something else
missing.
* Add/finish tests that distinguish const& from &
Fixes the bugs in my custom python type implementation,
demonstrate test that requires const& and reference_wrapper<const T>
being treated differently from Non-const.
* Add passing a const to non-const method.
* Demonstrate non-const conversion of reference_wrapper in tests.
Apply formatting presubmit check.
* Fix build errors from presubmit checks.
* Try and fix a few more CI errors
* More CI fixes.
* More CI fixups.
* Try and get PyPy to work.
* Additional minor fixups. Getting close to CI green.
* More ci fixes?
* fix clang-tidy warnings from presubmit
* fix more clang-tidy warnings
* minor comment and consistency cleanups
* PyDECREF -> Py_DECREF
* copy/move constructors
* Resolve codereview comments
* more review comment fixes
* review comments: remove spurious &
* Make the test fail even when the static_assert is commented out.
This expands the test_freezable_type_caster a bit by:
1/ adding accessors .is_immutable and .addr to compare identity
from python.
2/ Changing the default cast_op of the type_caster<> specialization
to return a non-const value. In normal codepaths this is a reasonable
default.
3/ adding roundtrip variants to exercise the by reference, by pointer
and by reference_wrapper in all call paths. In conjunction with 2/, this
demonstrates the failure case of the existing std::reference_wrpper conversion,
which now loses const in a similar way that happens when using the default cast_op_type<>.
* apply presubmit formatting
* Revert inclusion of test_freezable_type_caster
There's some concern that this test is a bit unwieldly because of the use
of the raw <Python.h> functions. Removing for now.
* Add a test that validates const references propagation.
This test verifies that cast_op may be used to correctly detect
const reference types when used with std::reference_wrapper.
* mend
* Review comments based changes.
1. std::add_lvalue_reference<type> -> type&
2. Simplify the test a little more; we're never returning the ConstRefCaster
type so the class_ definition can be removed.
* formatted files again.
* Move const_ref_caster test to builtin_casters
* Review comments: use cast_op and adjust some comments.
* Simplify ConstRefCasted test
I like this version better as it moves the assertion that matters
back into python.
2020-12-16 00:53:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_const_ref_caster():
|
|
|
|
|
"""Verifies that const-ref is propagated through type_caster cast_op.
|
2021-07-04 23:58:35 +00:00
|
|
|
|
The returned ConstRefCasted type is a minimal type that is constructed to
|
Adjusting `type_caster<std::reference_wrapper<T>>` to support const/non-const propagation in `cast_op`. (#2705)
* Allow type_caster of std::reference_wrapper<T> to be the same as a native reference.
Before, both std::reference_wrapper<T> and std::reference_wrapper<const T> would
invoke cast_op<type>. This doesn't allow the type_caster<> specialization for T
to distinguish reference_wrapper types from value types.
After, the type_caster<> specialization invokes cast_op<type&>, which allows
reference_wrapper to behave in the same way as a native reference type.
* Add tests/examples for std::reference_wrapper<const T>
* Add tests which use mutable/immutable variants
This test is a chimera; it blends the pybind11 casters with a custom
pytype implementation that supports immutable and mutable calls.
In order to detect the immutable/mutable state, the cast_op needs
to propagate it, even through e.g. std::reference<const T>
Note: This is still a work in progress; some things are crashing,
which likely means that I have a refcounting bug or something else
missing.
* Add/finish tests that distinguish const& from &
Fixes the bugs in my custom python type implementation,
demonstrate test that requires const& and reference_wrapper<const T>
being treated differently from Non-const.
* Add passing a const to non-const method.
* Demonstrate non-const conversion of reference_wrapper in tests.
Apply formatting presubmit check.
* Fix build errors from presubmit checks.
* Try and fix a few more CI errors
* More CI fixes.
* More CI fixups.
* Try and get PyPy to work.
* Additional minor fixups. Getting close to CI green.
* More ci fixes?
* fix clang-tidy warnings from presubmit
* fix more clang-tidy warnings
* minor comment and consistency cleanups
* PyDECREF -> Py_DECREF
* copy/move constructors
* Resolve codereview comments
* more review comment fixes
* review comments: remove spurious &
* Make the test fail even when the static_assert is commented out.
This expands the test_freezable_type_caster a bit by:
1/ adding accessors .is_immutable and .addr to compare identity
from python.
2/ Changing the default cast_op of the type_caster<> specialization
to return a non-const value. In normal codepaths this is a reasonable
default.
3/ adding roundtrip variants to exercise the by reference, by pointer
and by reference_wrapper in all call paths. In conjunction with 2/, this
demonstrates the failure case of the existing std::reference_wrpper conversion,
which now loses const in a similar way that happens when using the default cast_op_type<>.
* apply presubmit formatting
* Revert inclusion of test_freezable_type_caster
There's some concern that this test is a bit unwieldly because of the use
of the raw <Python.h> functions. Removing for now.
* Add a test that validates const references propagation.
This test verifies that cast_op may be used to correctly detect
const reference types when used with std::reference_wrapper.
* mend
* Review comments based changes.
1. std::add_lvalue_reference<type> -> type&
2. Simplify the test a little more; we're never returning the ConstRefCaster
type so the class_ definition can be removed.
* formatted files again.
* Move const_ref_caster test to builtin_casters
* Review comments: use cast_op and adjust some comments.
* Simplify ConstRefCasted test
I like this version better as it moves the assertion that matters
back into python.
2020-12-16 00:53:55 +00:00
|
|
|
|
reference the casting mode used.
|
|
|
|
|
"""
|
|
|
|
|
x = False
|
|
|
|
|
assert m.takes(x) == 1
|
|
|
|
|
assert m.takes_move(x) == 1
|
|
|
|
|
|
|
|
|
|
assert m.takes_ptr(x) == 3
|
|
|
|
|
assert m.takes_ref(x) == 2
|
|
|
|
|
assert m.takes_ref_wrap(x) == 2
|
|
|
|
|
|
|
|
|
|
assert m.takes_const_ptr(x) == 5
|
|
|
|
|
assert m.takes_const_ref(x) == 4
|
|
|
|
|
assert m.takes_const_ref_wrap(x) == 4
|