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

fix: improve str exceptions and consistency with python (#3826)

Browse Source 
* Improve str exceptions

* Revert macro change just in case

* Make clang-tidy happy

* Fix one more clang-tidy issue

* Refactor duplicate method
This commit is contained in:
Aaron Gokaslan 2022-03-25 16:01:34 -04:00 committed by GitHub
parent 7742be02d9
commit 3a183d4b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/pybind11/pytypes.h
View File

@ -1243,8 +1243,8 @@ public:
} }
char *buffer = nullptr; char *buffer = nullptr;
ssize_t length = 0; ssize_t length = 0;
if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length)) { if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
pybind11_fail("Unable to extract string contents! (invalid type)"); throw error_already_set();
} }
return std::string(buffer, (size_t) length); return std::string(buffer, (size_t) length);
} }
@ -1299,14 +1299,7 @@ public:
explicit bytes(const pybind11::str &s); explicit bytes(const pybind11::str &s);
// NOLINTNEXTLINE(google-explicit-constructor) // NOLINTNEXTLINE(google-explicit-constructor)
operator std::string() const { operator std::string() const { return string_op<std::string>(); }
char *buffer = nullptr;
ssize_t length = 0;
if (PYBIND11_BYTES_AS_STRING_AND_SIZE(m_ptr, &buffer, &length)) {
pybind11_fail("Unable to extract bytes contents!");
}
return std::string(buffer, (size_t) length);
}
#ifdef PYBIND11_HAS_STRING_VIEW #ifdef PYBIND11_HAS_STRING_VIEW
// enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521). // enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521).
@ -1318,15 +1311,18 @@ public:
// valid so long as the `bytes` instance remains alive and so generally should not outlive the // valid so long as the `bytes` instance remains alive and so generally should not outlive the
// lifetime of the `bytes` instance. // lifetime of the `bytes` instance.
// NOLINTNEXTLINE(google-explicit-constructor) // NOLINTNEXTLINE(google-explicit-constructor)
operator std::string_view() const { operator std::string_view() const { return string_op<std::string_view>(); }
#endif
private:
template <typename T>
T string_op() const {
char *buffer = nullptr; char *buffer = nullptr;
ssize_t length = 0; ssize_t length = 0;
if (PYBIND11_BYTES_AS_STRING_AND_SIZE(m_ptr, &buffer, &length)) { if (PyBytes_AsStringAndSize(m_ptr, &buffer, &length) != 0) {
pybind11_fail("Unable to extract bytes contents!"); throw error_already_set();
} }
return {buffer, static_cast<size_t>(length)}; return {buffer, static_cast<size_t>(length)};
} }
#endif
}; };
// Note: breathe >= 4.17.0 will fail to build docs if the below two constructors // Note: breathe >= 4.17.0 will fail to build docs if the below two constructors
// are included in the doxygen group; close here and reopen after as a workaround // are included in the doxygen group; close here and reopen after as a workaround
@ -1337,13 +1333,13 @@ inline bytes::bytes(const pybind11::str &s) {
if (PyUnicode_Check(s.ptr())) { if (PyUnicode_Check(s.ptr())) {
temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(s.ptr())); temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(s.ptr()));
if (!temp) { if (!temp) {
pybind11_fail("Unable to extract string contents! (encoding issue)"); throw error_already_set();
} }
} }
char *buffer = nullptr; char *buffer = nullptr;
ssize_t length = 0; ssize_t length = 0;
if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length)) { if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
pybind11_fail("Unable to extract string contents! (invalid type)"); throw error_already_set();
} }
auto obj = reinterpret_steal<object>(PYBIND11_BYTES_FROM_STRING_AND_SIZE(buffer, length)); auto obj = reinterpret_steal<object>(PYBIND11_BYTES_FROM_STRING_AND_SIZE(buffer, length));
if (!obj) { if (!obj) {
@ -1355,8 +1351,8 @@ inline bytes::bytes(const pybind11::str &s) {
inline str::str(const bytes &b) { inline str::str(const bytes &b) {
char *buffer = nullptr; char *buffer = nullptr;
ssize_t length = 0; ssize_t length = 0;
if (PYBIND11_BYTES_AS_STRING_AND_SIZE(b.ptr(), &buffer, &length)) { if (PyBytes_AsStringAndSize(b.ptr(), &buffer, &length) != 0) {
pybind11_fail("Unable to extract bytes contents!"); throw error_already_set();
} }
auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, length)); auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, length));
if (!obj) { if (!obj) {