2024-06-22 04:55:00 +00:00
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
import sys
|
|
|
|
|
|
2017-06-08 22:44:49 +00:00
|
|
|
|
import pytest
|
|
|
|
|
|
2021-10-08 12:38:04 +00:00
|
|
|
|
import env
|
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."""
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.good_utf8_string() == "Say utf8‽ 🎂 𝐀"
|
|
|
|
|
assert m.good_utf16_string() == "b‽🎂𝐀z"
|
|
|
|
|
assert m.good_utf32_string() == "a𝐀🎂‽z"
|
|
|
|
|
assert m.good_wchar_string() == "a⸘𝐀z"
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.good_utf8_u8string() == "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()
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
# These are provided only if they actually fail (they don't when 32-bit)
|
2017-06-08 22:44:49 +00:00
|
|
|
|
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"
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.u8_eacute() == "é"
|
|
|
|
|
assert m.u16_ibang() == "‽"
|
|
|
|
|
assert m.u32_mathbfA() == "𝐀"
|
|
|
|
|
assert m.wchar_heart() == "♥"
|
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):
|
2022-02-12 00:06:16 +00:00
|
|
|
|
return f"Character code point not in range({r:#x})"
|
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"
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char("a") == 0x61 # simple ASCII
|
|
|
|
|
assert m.ord_char_lv("b") == 0x62
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.ord_char("é") == 0xE9
|
2020-10-16 20:38:13 +00:00
|
|
|
|
) # 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:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char("Ā") == 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:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char("ab")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char16("a") == 0x61
|
|
|
|
|
assert m.ord_char16("é") == 0xE9
|
|
|
|
|
assert m.ord_char16_lv("ê") == 0xEA
|
|
|
|
|
assert m.ord_char16("Ā") == 0x100
|
|
|
|
|
assert m.ord_char16("‽") == 0x203D
|
|
|
|
|
assert m.ord_char16("♥") == 0x2665
|
|
|
|
|
assert m.ord_char16_lv("♡") == 0x2661
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char16("🎂") == 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:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char16("aa")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char32("a") == 0x61
|
|
|
|
|
assert m.ord_char32("é") == 0xE9
|
|
|
|
|
assert m.ord_char32("Ā") == 0x100
|
|
|
|
|
assert m.ord_char32("‽") == 0x203D
|
|
|
|
|
assert m.ord_char32("♥") == 0x2665
|
|
|
|
|
assert m.ord_char32("🎂") == 0x1F382
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char32("aa")
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toolong_message
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_wchar("a") == 0x61
|
|
|
|
|
assert m.ord_wchar("é") == 0xE9
|
|
|
|
|
assert m.ord_wchar("Ā") == 0x100
|
|
|
|
|
assert m.ord_wchar("‽") == 0x203D
|
|
|
|
|
assert m.ord_wchar("♥") == 0x2665
|
2017-06-08 22:44:49 +00:00
|
|
|
|
if m.wchar_size == 2:
|
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_wchar("🎂") == 0x1F382 # requires surrogate pair
|
2017-06-08 22:44:49 +00:00
|
|
|
|
assert str(excinfo.value) == toobig_message(0x10000)
|
|
|
|
|
else:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_wchar("🎂") == 0x1F382
|
2017-06-08 22:44:49 +00:00
|
|
|
|
with pytest.raises(ValueError) as excinfo:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_wchar("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"):
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char8("a") == 0x61 # simple ASCII
|
|
|
|
|
assert m.ord_char8_lv("b") == 0x62
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.ord_char8("é") == 0xE9
|
2020-10-16 20:38:13 +00:00
|
|
|
|
) # 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:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char8("Ā") == 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:
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.ord_char8("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
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.strlen(b"hi") == 2
|
|
|
|
|
assert m.string_length(b"world") == 5
|
2023-02-22 14:18:55 +00:00
|
|
|
|
assert m.string_length(b"a\x00b") == 3
|
|
|
|
|
assert m.strlen(b"a\x00b") == 1 # C-string limitation
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
# passing in a utf8 encoded string should work
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_length("💩".encode()) == 4
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
|
2022-02-23 23:21:03 +00:00
|
|
|
|
def test_bytearray_to_string():
|
|
|
|
|
"""Tests the ability to pass bytearray to C++ string-accepting functions"""
|
|
|
|
|
assert m.string_length(bytearray(b"Hi")) == 2
|
|
|
|
|
assert m.strlen(bytearray(b"bytearray")) == 9
|
|
|
|
|
assert m.string_length(bytearray()) == 0
|
|
|
|
|
assert m.string_length(bytearray("🦜", "utf-8", "strict")) == 4
|
|
|
|
|
assert m.string_length(bytearray(b"\x80")) == 1
|
|
|
|
|
|
|
|
|
|
|
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]
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view16_chars("Hi 🎂") == [72, 105, 32, 0xD83C, 0xDF82]
|
|
|
|
|
assert m.string_view32_chars("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]
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view8_chars("Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view_return() == "utf8 secret 🎂"
|
|
|
|
|
assert m.string_view16_return() == "utf16 secret 🎂"
|
|
|
|
|
assert m.string_view32_return() == "utf32 secret 🎂"
|
2019-12-19 11:16:24 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view8_return() == "utf8 secret 🎂"
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
with capture:
|
|
|
|
|
m.string_view_print("Hi")
|
|
|
|
|
m.string_view_print("utf8 🎂")
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.string_view16_print("utf16 🎂")
|
|
|
|
|
m.string_view32_print("utf32 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
2022-02-11 02:28:08 +00:00
|
|
|
|
== """
|
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")
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.string_view8_print("utf8 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
2022-02-11 02:28:08 +00:00
|
|
|
|
== """
|
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 🎂")
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.string_view16_print("Hi, utf16 🎂")
|
|
|
|
|
m.string_view32_print("Hi, utf32 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
2022-02-11 02:28:08 +00:00
|
|
|
|
== """
|
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")
|
2022-02-11 02:28:08 +00:00
|
|
|
|
m.string_view8_print("Hi, utf8 🎂")
|
2020-10-16 20:38:13 +00:00
|
|
|
|
assert (
|
|
|
|
|
capture
|
2022-02-11 02:28:08 +00:00
|
|
|
|
== """
|
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
|
|
|
|
|
2021-12-03 17:20:32 +00:00
|
|
|
|
assert m.string_view_bytes() == b"abc \x80\x80 def"
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view_str() == "abc ‽ def"
|
|
|
|
|
assert m.string_view_from_bytes("abc ‽ def".encode()) == "abc ‽ def"
|
2021-12-03 17:20:32 +00:00
|
|
|
|
if hasattr(m, "has_u8string"):
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.string_view8_str() == "abc ‽ def"
|
|
|
|
|
assert m.string_view_memoryview() == "Have some 🎂".encode()
|
2021-12-03 17:20:32 +00:00
|
|
|
|
|
|
|
|
|
assert m.bytes_from_type_with_both_operator_string_and_string_view() == b"success"
|
|
|
|
|
assert m.str_from_type_with_both_operator_string_and_string_view() == "success"
|
|
|
|
|
|
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"
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert m.i64_str(-999999999999) == "-999999999999"
|
|
|
|
|
assert m.u64_str(999999999999) == "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
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def test_int_convert():
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class Int:
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class NotInt:
|
2021-01-17 01:52:14 +00:00
|
|
|
|
pass
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class Float:
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __float__(self):
|
|
|
|
|
return 41.99999
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class Index:
|
2021-01-17 01:52:14 +00:00
|
|
|
|
def __index__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class IntAndIndex:
|
2021-01-25 20:05:17 +00:00
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
|
|
|
|
def __index__(self):
|
|
|
|
|
return 0
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class RaisingTypeErrorOnIndex:
|
2021-01-25 20:05:17 +00:00
|
|
|
|
def __index__(self):
|
|
|
|
|
raise TypeError
|
|
|
|
|
|
|
|
|
|
def __int__(self):
|
|
|
|
|
return 42
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class RaisingValueErrorOnIndex:
|
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)
|
2021-11-17 14:44:19 +00:00
|
|
|
|
# TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
|
feat: remove Python 3.7 support (#5191)
* First pass updating misc files, informed by https://github.com/pybind/pybind11/pull/5177/commits
* Remove jobs using silkeh/clang and gcc docker containers that come with Python 3.7
* Add silkeh/clang:17-bookworm
* Add job using GCC 7
* Revert "Add job using GCC 7"
This reverts commit 518515a761ac37dc2cf5d0980da82d0de39edc28.
* Try running in ubuntu-18.04 container under ubuntu-latest (to get GCC 7)
* Fix `-` vs `:` mixup.
* This reverts commit b1c4304475b8ad129c12330c7ed7eb85d15ba14a.
Revert "Try running in ubuntu:18.04 container under ubuntu-latest (to get GCC 7)"
This reverts commit b203a294bb444fc6ae57a0100fa91dc91b8d3264.
* `git grep 0x03080000` cleanup.
* `git grep -I -E '3\.7'` cleanup.
Removes two changes made under pybind/pybind11#3702
* Revert "`git grep -I -E '3\.7'` cleanup."
This reverts commit bb5b9d187bffbfb61e2977d7eee46b766fa1cce9.
* Remove comments that are evidently incorrect:
```
...
-- The CXX compiler identification is Clang 15.0.7
...
- Found Python: /usr/bin/python3.9 (found suitable version "3.9.2", minimum required is "3.7") found components: Interpreter Development.Module Development.Embed
...
/__w/pybind11/pybind11/include/pybind11/gil.h:150:13: error: 'auto key' can be declared as 'auto *key' [readability-qualified-auto,-warnings-as-errors]
auto key = internals.tstate;
^~~~~
auto *
/__w/pybind11/pybind11/include/pybind11/gil.h:174:13: error: 'auto key' can be declared as 'auto *key' [readability-qualified-auto,-warnings-as-errors]
auto key = detail::get_internals().tstate;
^~~~~
auto *
```
* .github/workflows/configure.yml: Change from Python 3.7 to 3.8
* Misc cleanup pass
* Miscellaneous changes based on manual review of the `git grep` matches below:
```
git_grep_37_38.sh |& sort | uniq -c
```
With git_grep_37_38.sh:
```
set -x
git grep 0x0307
git grep 0x0308
git grep PY_MINOR_VERSION
git grep PYPY_VERSION
git grep -I -E '3\.7'
git grep -I -E '3\.8'
git grep -I -E '\(3, 7'
git grep -I -E '\(3, 8'
git grep -I -E '3[^A-Za-z0-9.]+7'
git grep -I -E '3[^A-Za-z0-9.]+8'
```
Output:
```
1 .appveyor.yml: $env:CMAKE_INCLUDE_PATH = "eigen-3.3.7;$env:CMAKE_INCLUDE_PATH"
1 .appveyor.yml: 7z x eigen-3.3.7.zip -y > $null
1 .appveyor.yml: Start-FileDownload 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.zip'
1 CMakeLists.txt: # Bug in macOS CMake < 3.7 is unable to download catch
1 CMakeLists.txt: elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.8)
1 CMakeLists.txt: if(OSX AND CMAKE_VERSION VERSION_LESS 3.7)
1 CMakeLists.txt: message(WARNING "CMAKE 3.7+ needed on macOS to download catch, and newer HIGHLY recommended")
1 CMakeLists.txt: message(WARNING "CMAKE 3.8+ tested on Windows, previous versions untested")
1 CMakeLists.txt: # Only tested with 3.8+ in CI.
1 docs/advanced/functions.rst:Python 3.8 introduced a new positional-only argument syntax, using ``/`` in the
1 docs/changelog.rst:* Adapt pybind11 to a C API convention change in Python 3.8. `#1950
1 docs/changelog.rst:* Allow thread termination to be avoided during shutdown for CPython 3.7+ via
1 docs/changelog.rst: considered as conversion, consistent with Python 3.8+.
1 docs/changelog.rst: CPython 3.8 and 3.9 debug builds.
1 docs/changelog.rst:* Enum now has an ``__index__`` method on Python <3.8 too.
1 docs/changelog.rst: on Python 3.8. `#1780 <https://github.com/pybind/pybind11/pull/1780>`_.
1 docs/changelog.rst:* PyPy 3.10 support was added, PyPy 3.7 support was dropped.
2 docs/changelog.rst:* Support PyPy 7.3.7 and the PyPy3.8 beta. Test python-3.11 on PRs with the
1 docs/changelog.rst:* Use ``macos-13`` (Intel) for CI jobs for now (will drop Python 3.7 soon).
1 docs/changelog.rst:* Use new Python 3.7 Thread Specific Storage (TSS) implementation if available.
1 docs/compiling.rst: cmake -DPYBIND11_PYTHON_VERSION=3.8 ..
1 docs/compiling.rst: find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
1 docs/limitations.rst:- PyPy3 7.3.1 and 7.3.2 have issues with several tests on 32-bit Windows.
1 docs/requirements.txt:idna==3.7 \
1 + git grep 0x0307
1 + git grep 0x0308
1 + git grep -I -E '\(3, 7'
1 + git grep -I -E '3\.7'
1 + git grep -I -E '\(3, 8'
1 + git grep -I -E '3\.8'
1 + git grep -I -E '3[^A-Za-z0-9.]+7'
1 + git grep -I -E '3[^A-Za-z0-9.]+8'
1 + git grep PY_MINOR_VERSION
1 + git grep PYPY_VERSION
2 .github/workflows/ci.yml: - '3.8'
1 .github/workflows/ci.yml: - 3.8
1 .github/workflows/ci.yml: - name: Add Python 3.8
1 .github/workflows/ci.yml: - 'pypy-3.8'
2 .github/workflows/ci.yml: python: '3.8'
1 .github/workflows/ci.yml: - python: '3.8'
1 .github/workflows/ci.yml: - python: 3.8
1 .github/workflows/ci.yml: python: 'pypy-3.8'
1 .github/workflows/configure.yml: cmake: "3.8"
1 .github/workflows/configure.yml: name: 🐍 3.8 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }}
1 .github/workflows/configure.yml: - name: Setup Python 3.8
1 .github/workflows/configure.yml: python-version: 3.8
1 .github/workflows/pip.yml: name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-latest
1 .github/workflows/pip.yml: name: 🐍 3.8 • 📦 tests • windows-latest
2 .github/workflows/pip.yml: - name: Setup 🐍 3.8
2 .github/workflows/pip.yml: python-version: 3.8
2 include/pybind11/cast.h:#if !defined(PYPY_VERSION)
2 include/pybind11/cast.h:#if defined(PYPY_VERSION)
2 include/pybind11/cast.h: // PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls.
5 include/pybind11/detail/class.h:#if !defined(PYPY_VERSION)
1 include/pybind11/detail/class.h:#if defined(PYPY_VERSION)
1 include/pybind11/detail/class.h: // This was not needed before Python 3.8 (Python issue 35810)
1 include/pybind11/detail/common.h: && !defined(PYPY_VERSION) && !defined(PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF)
2 include/pybind11/detail/common.h:# error "PYTHON < 3.8 IS UNSUPPORTED. pybind11 v2.13 was the last to support Python 3.7."
1 include/pybind11/detail/common.h:#if defined(PYPY_VERSION) && !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
1 include/pybind11/detail/common.h:#if PY_VERSION_HEX < 0x03080000
1 include/pybind11/detail/common.h: = PYBIND11_TOSTRING(PY_MAJOR_VERSION) "." PYBIND11_TOSTRING(PY_MINOR_VERSION); \
1 include/pybind11/detail/internals.h: // called. PYBIND11_TLS_FREE is PyThread_tss_free on python 3.7+. On older python, it does
1 include/pybind11/detail/internals.h:#if PYBIND11_INTERNALS_VERSION <= 4 || defined(PYPY_VERSION)
1 include/pybind11/detail/internals.h:// The old Python Thread Local Storage (TLS) API is deprecated in Python 3.7 in favor of the new
1 include/pybind11/detail/type_caster_base.h:#if defined(PYPY_VERSION)
1 include/pybind11/embed.h:# define PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX (0x03080000)
1 include/pybind11/embed.h:#if defined(PYPY_VERSION)
1 include/pybind11/eval.h: // globals if not yet present. Python 3.8 made PyRun_String behave
2 include/pybind11/eval.h:#if defined(PYPY_VERSION)
2 include/pybind11/eval.h: // was missing from PyPy3.8 7.3.7.
2 include/pybind11/gil.h: /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
1 include/pybind11/pybind11.h:#if !defined(PYPY_VERSION)
4 include/pybind11/pybind11.h:#if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9
1 include/pybind11/pytypes.h:#endif //! defined(PYPY_VERSION)
2 include/pybind11/pytypes.h:#if !defined(PYPY_VERSION)
1 include/pybind11/pytypes.h:# if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030a00
1 include/pybind11/pytypes.h:#ifdef PYPY_VERSION
1 include/pybind11/stl/filesystem.h:# if !defined(PYPY_VERSION)
2 pybind11/__init__.py:if sys.version_info < (3, 8):
2 pybind11/__init__.py: msg = "pybind11 does not support Python < 3.8. v2.13 was the last release supporting Python 3.7."
1 pyproject.toml:master.py-version = "3.8"
1 pyproject.toml:python_version = "3.8"
1 README.rst:lines of code and depend on Python (3.8+, or PyPy) and the C++
2 README.rst:- Python 3.8+, and PyPy3 7.3 are supported with an implementation-agnostic
1 setup.cfg: Programming Language :: Python :: 3.8
1 setup.cfg:python_requires = >=3.8
1 setup.py:# TODO: use literals & overload (typing extensions or Python 3.8)
1 tests/CMakeLists.txt:if(NOT CMAKE_VERSION VERSION_LESS 3.8)
2 tests/constructor_stats.h:#if defined(PYPY_VERSION)
1 tests/env.py: doesn't work on CPython 3.8.0 with pytest==3.3.2 on Ubuntu 18.04 (#2922).
1 tests/requirements.txt:build~=1.0; python_version>="3.8"
1 tests/requirements.txt:numpy~=1.21.5; platform_python_implementation!="PyPy" and python_version>="3.8" and python_version<"3.10"
1 tests/requirements.txt:numpy~=1.23.0; python_version=="3.8" and platform_python_implementation=="PyPy"
1 tests/test_buffers.py: env.PYPY, reason="PyPy 7.3.7 doesn't clear this anymore", strict=False
1 tests/test_builtin_casters.py: # Before Python 3.8, `PyLong_AsLong` does not pick up on `obj.__index__`,
2 tests/test_builtin_casters.py: if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON:
4 tests/test_builtin_casters.py: # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
1 tests/test_callbacks.py: assert m.test_callback3(z.double) == "func(43) = 86"
2 tests/test_call_policies.cpp:#if !defined(PYPY_VERSION)
1 tests/test_chrono.py: diff = m.test_chrono_float_diff(43.789012, 1.123456)
1 tests/test_constants_and_functions.py: assert m.f3(86) == 89
1 tests/test_eigen_matrix.py: a_copy3[8, 1] = 11
1 tests/test_eigen_matrix.py: assert np.all(cornersc == np.array([[1.0, 3], [7, 9]]))
1 tests/test_eigen_matrix.py: assert np.all(cornersr == np.array([[1.0, 3], [7, 9]]))
1 tests/test_eigen_matrix.py: mymat = chol(np.array([[1.0, 2, 4], [2, 13, 23], [4, 23, 77]]))
1 tests/test_exceptions.py: if hasattr(pytest, unraisable): # Python >= 3.8 and pytest >= 6
2 tests/test_exceptions.py:@pytest.mark.xfail(env.PYPY, reason="Failure on PyPy 3.8 (7.3.7)", strict=False)
1 tests/test_factory_constructors.py: assert [i.alive() for i in cstats] == [13, 7]
1 tests/test_kwargs_and_defaults.cpp:#ifdef PYPY_VERSION
1 tests/test_local_bindings.py: assert i1.get3() == 8
1 tests/test_methods_and_attributes.cpp:#if !defined(PYPY_VERSION)
1 tests/test_numpy_array.py: a = np.arange(3 * 7 * 2) + 1
1 tests/test_numpy_array.py: assert str(excinfo.value) == "cannot reshape array of size 42 into shape (3,7,1)"
2 tests/test_numpy_array.py: assert x.shape == (3, 7, 2)
2 tests/test_numpy_array.py: m.reshape_tuple(a, (3, 7, 1))
2 tests/test_numpy_array.py: x = m.reshape_tuple(a, (3, 7, 2))
1 tests/test_numpy_vectorize.py: assert np.isclose(m.vectorized_func3(np.array(3 + 7j)), [6 + 14j])
1 tests/test_pickling.cpp:#if !defined(PYPY_VERSION)
1 tests/test_pytypes.cpp:#if (defined(__APPLE__) && defined(__clang__)) || defined(PYPY_VERSION)
1 tests/test_smart_ptr.cpp: m.def("make_myobject3_1", []() { return new MyObject3(8); });
1 tests/test_smart_ptr.py: assert cstats.values() == ["MyObject3[9]", "MyObject3[8]", "MyObject3[9]"]
1 tests/test_stl_binders.py: assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88])
1 tests/test_stl_binders.py: assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88, 4])
1 tests/test_type_caster_pyobject_ptr.cpp:#if !defined(PYPY_VERSION) // It is not worth the trouble doing something special for PyPy.
1 tools/FindPythonLibsNew.cmake: set(PythonLibsNew_FIND_VERSION "3.8")
1 tools/JoinPaths.cmake:# https://docs.python.org/3.7/library/os.path.html#os.path.join
1 tools/pybind11NewTools.cmake: Python 3.8 REQUIRED COMPONENTS ${_pybind11_interp_component} ${_pybind11_dev_component}
1 tools/pybind11NewTools.cmake:# Python debug libraries expose slightly different objects before 3.8
1 tools/pybind11Tools.cmake: "3.12;3.11;3.10;3.9;3.8"
1 tools/pybind11Tools.cmake: if(NOT DEFINED PYPY_VERSION)
1 tools/pybind11Tools.cmake: message(STATUS "PYPY ${PYPY_VERSION} (Py ${PYTHON_VERSION})")
1 tools/pybind11Tools.cmake:# Python debug libraries expose slightly different objects before 3.8
1 tools/pybind11Tools.cmake: set(PYPY_VERSION
```
* Change `[tool.ruff]` `target-version` to `"py38"`, as suggested by @Skylion007
2024-07-30 16:18:35 +00:00
|
|
|
|
if sys.version_info < (3, 10) and env.CPYTHON:
|
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)
|
2021-11-17 14:44:19 +00:00
|
|
|
|
# TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
|
|
|
|
|
# https://github.com/pybind/pybind11/issues/3408
|
2022-02-11 02:28:08 +00:00
|
|
|
|
if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON:
|
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)
|
|
|
|
|
== """
|
2023-09-12 19:46:58 +00:00
|
|
|
|
pair_passthrough(arg0: tuple[bool, str]) -> tuple[str, bool]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
Return a pair in reversed order
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
|
|
|
|
assert (
|
|
|
|
|
doc(m.tuple_passthrough)
|
|
|
|
|
== """
|
2023-09-12 19:46:58 +00:00
|
|
|
|
tuple_passthrough(arg0: tuple[bool, str, int]) -> tuple[int, str, bool]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
Return a triple in reversed order
|
|
|
|
|
"""
|
2020-10-16 20:38:13 +00:00
|
|
|
|
)
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
2024-06-30 16:52:37 +00:00
|
|
|
|
assert doc(m.empty_tuple) == """empty_tuple() -> tuple[()]"""
|
|
|
|
|
|
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]
|
2023-02-22 14:18:55 +00:00
|
|
|
|
assert a1[0] is not a2[0]
|
|
|
|
|
assert a1[1] is not a2[1]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
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]
|
2023-02-22 14:18:55 +00:00
|
|
|
|
assert b1[0] is b2[0]
|
|
|
|
|
assert b1[1] is b2[1]
|
2017-06-08 22:44:49 +00:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class A:
|
2017-07-23 15:02:43 +00:00
|
|
|
|
def __init__(self, x):
|
|
|
|
|
self.x = x
|
|
|
|
|
|
|
|
|
|
def __nonzero__(self):
|
|
|
|
|
return self.x
|
|
|
|
|
|
|
|
|
|
def __bool__(self):
|
|
|
|
|
return self.x
|
|
|
|
|
|
2022-02-11 02:28:08 +00:00
|
|
|
|
class B:
|
2017-07-23 15:02:43 +00:00
|
|
|
|
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():
|
|
|
|
|
assert isinstance(m.int_cast(), int)
|
|
|
|
|
assert isinstance(m.long_cast(), int)
|
2022-02-11 02:28:08 +00:00
|
|
|
|
assert isinstance(m.longlong_cast(), int)
|
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
|