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

add support in string_caster for loading bytes 'as-is' into uint8_t-based strings and string_views

Browse Source
This commit is contained in:
Guillaume Giraud 2021-05-26 10:45:10 -05:00
parent 1083c2b9c7
commit c50af5b8f8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/pybind11/cast.h
View File

@ -389,9 +389,13 @@ template <typename StringType, bool IsView = false> struct string_caster {
static handle cast(const StringType &src, return_value_policy /* policy */, handle /* parent */) { static handle 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 (std::is_same_v<CharT, uint8_t>)
if (!s) throw error_already_set(); return PyBytes_FromStringAndSize(buffer, nbytes);
return s; else {
handle s = decode_utfN(buffer, nbytes);
if (!s) throw error_already_set();
return s;
}
} }
PYBIND11_TYPE_CASTER(StringType, _(PYBIND11_STRING_NAME)); PYBIND11_TYPE_CASTER(StringType, _(PYBIND11_STRING_NAME));
@ -409,18 +413,20 @@ private:
return PyUnicode_Decode(buffer, nbytes, UTF_N == 8 ? "utf-8" : UTF_N == 16 ? "utf-16" : "utf-32", nullptr); return PyUnicode_Decode(buffer, nbytes, UTF_N == 8 ? "utf-8" : UTF_N == 16 ? "utf-16" : "utf-32", nullptr);
#endif #endif
} }
template<typename C>
using accept_bytes_as_is = any_of<std::is_same<C, char>, std::is_same<C, uint8_t>>;
// When loading into a std::string or char*, accept a bytes object as-is (i.e. // When loading into a std::string or char*, accept a bytes 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_bytes(enable_if_t<std::is_same<C, char>::value, handle> src) { bool load_bytes(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 a Python 3 raw bytes; accept it into a std::string or char* // We were passed a Python 3 raw bytes; accept it into a std::string or char*
// without any encoding attempt. // without any encoding attempt.
const char *bytes = PYBIND11_BYTES_AS_STRING(src.ptr()); const char *bytes = PYBIND11_BYTES_AS_STRING(src.ptr());
if (bytes) { if (bytes) {
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;
} }
} }
@ -429,7 +435,9 @@ private:
} }
template <typename C = CharT> template <typename C = CharT>
bool load_bytes(enable_if_t<!std::is_same<C, char>::value, handle>) { return false; } bool load_bytes(enable_if_t<!accept_bytes_as_is<C>::value, handle>) {
return false;
}
}; };
template <typename CharT, class Traits, class Allocator> template <typename CharT, class Traits, class Allocator>