Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-13 09:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1334c7eae7 into 66c3774a64

Browse Source
This commit is contained in:
Guillaume Giraud 2024-09-02 12:23:53 +09:00 committed by GitHub
commit dd5e9a8cec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/pybind11/cast.h
View File

@ -114,6 +114,10 @@ public:
template <typename CharT> template <typename CharT>
using is_std_char_type = any_of<std::is_same<CharT, char>, /* std::string */ using is_std_char_type = any_of<std::is_same<CharT, char>, /* std::string */
#if defined(PYBIND11_CPP17)
std::is_same<CharT, std::byte>, /* std::byte */
#endif
std::is_same<CharT, uint8_t>, /* uint8_t */
#if defined(PYBIND11_HAS_U8STRING) #if defined(PYBIND11_HAS_U8STRING)
std::is_same<CharT, char8_t>, /* std::u8string */ std::is_same<CharT, char8_t>, /* std::u8string */
#endif #endif
@ -450,11 +454,21 @@ struct string_caster {
cast(const StringType &src, return_value_policy /* policy */, handle /* parent */) { cast(const StringType &src, return_value_policy /* policy */, handle /* parent */) {
const char *buffer = reinterpret_cast<const char *>(src.data()); const char *buffer = reinterpret_cast<const char *>(src.data());
auto nbytes = ssize_t(src.size() * sizeof(CharT)); auto nbytes = ssize_t(src.size() * sizeof(CharT));
handle s = decode_utfN(buffer, nbytes); #if defined(PYBIND11_CPP17)
if (!s) { if constexpr (std::is_same<CharT, uint8_t>::value ||
throw error_already_set(); std::is_same<CharT, std::byte>::value)
#else
if (std::is_same<CharT, uint8_t>::value)
#endif
{
return PyBytes_FromStringAndSize(buffer, nbytes);
} else {
handle s = decode_utfN(buffer, nbytes);
if (!s) {
throw error_already_set();
}
return s;
} }
return s;
} }
PYBIND11_TYPE_CASTER(StringType, const_name(PYBIND11_STRING_NAME)); PYBIND11_TYPE_CASTER(StringType, const_name(PYBIND11_STRING_NAME));
@ -477,12 +491,18 @@ private:
nullptr); nullptr);
#endif #endif
} }
template <typename C>
using accept_bytes_as_is = any_of<std::is_same<C, char>,
#if defined(PYBIND11_CPP17)
std::is_same<C, std::byte>,
#endif
std::is_same<C, uint8_t>>;
// When loading into a std::string or char*, accept a bytes/bytearray object as-is (i.e. // When loading into a std::string or char*, accept a bytes/bytearray object as-is (i.e.
// without any encoding/decoding attempt). For other C++ char sizes this is a no-op. // without any encoding/decoding attempt). For other C++ char sizes this is a no-op.
// which supports loading a unicode from a str, doesn't take this path. // which supports loading a unicode from a str, doesn't take this path.
template <typename C = CharT> template <typename C = CharT>
bool load_raw(enable_if_t<std::is_same<C, char>::value, handle> src) { bool load_raw(enable_if_t<accept_bytes_as_is<C>::value, handle> src) {
if (PYBIND11_BYTES_CHECK(src.ptr())) { if (PYBIND11_BYTES_CHECK(src.ptr())) {
// We were passed raw bytes; accept it into a std::string or char* // We were passed raw bytes; accept it into a std::string or char*
// without any encoding attempt. // without any encoding attempt.
@ -490,7 +510,7 @@ private:
if (!bytes) { if (!bytes) {
pybind11_fail("Unexpected PYBIND11_BYTES_AS_STRING() failure."); pybind11_fail("Unexpected PYBIND11_BYTES_AS_STRING() failure.");
} }
value = StringType(bytes, (size_t) PYBIND11_BYTES_SIZE(src.ptr())); value = StringType((const C *) bytes, (size_t) PYBIND11_BYTES_SIZE(src.ptr()));
return true; return true;
} }
if (PyByteArray_Check(src.ptr())) { if (PyByteArray_Check(src.ptr())) {
@ -500,7 +520,7 @@ private:
if (!bytearray) { if (!bytearray) {
pybind11_fail("Unexpected PyByteArray_AsString() failure."); pybind11_fail("Unexpected PyByteArray_AsString() failure.");
} }
value = StringType(bytearray, (size_t) PyByteArray_Size(src.ptr())); value = StringType((const C *) bytearray, (size_t) PyByteArray_Size(src.ptr()));
return true; return true;
} }
@ -508,7 +528,7 @@ private:
} }
template <typename C = CharT> template <typename C = CharT>
bool load_raw(enable_if_t<!std::is_same<C, char>::value, handle>) { bool load_raw(enable_if_t<!accept_bytes_as_is<C>::value, handle>) {
return false; return false;
} }
}; };