Skip to content

Experiments based on PR #2198 #2711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rwgk wants to merge 4 commits into from
Closed

Experiments based on PR #2198 #2711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d80ad5
github current snapshot
rwgk Dec 4, 2020
011663d
enable new behavior only for Python 3, adjust new test to work with P…
rwgk Dec 4, 2020
97b3463
restoring original behavior, only leaving the new lambda function in …
rwgk Dec 4, 2020
04859f2
also commenting out the new lambda function in test_stl.cpp
rwgk Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/pybind11/stl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,15 @@ template <typename Type, typename Value> struct list_caster {
using value_conv = make_caster<Value>;

bool load(handle src, bool convert) {
#if 1
if (!isinstance<sequence>(src) || isinstance<str>(src))
#else
if (!isinstance<sequence>(src) || (
#if PY_MAJOR_VERSION >= 3
!isinstance<bytes>(src) &&
#endif
isinstance<str>(src)))
#endif
return false;
auto s = reinterpret_borrow<sequence>(src);
value.clear();
Expand Down
3 changes: 3 additions & 0 deletions tests/test_stl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@ TEST_SUBMODULE(stl, m) {
m.def("func_with_string_or_vector_string_arg_overload", [](std::list<std::string>) { return 2; });
m.def("func_with_string_or_vector_string_arg_overload", [](std::string) { return 3; });

// #1807: 2.3.0 regression: <class 'bytes'> is not converted to std::vector<uint8_t> anymore
//m.def("func_with_vector_uint8_t_arg", [](std::vector<uint8_t> v) { return v.size(); });

class Placeholder {
public:
Placeholder() { print_created(this); }
Expand Down
7 changes: 7 additions & 0 deletions tests/test_stl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@ def test_function_with_string_and_vector_string_arg():
assert m.func_with_string_or_vector_string_arg_overload("A") == 3


#def test_bytes_to_vector_uint8_t():
# """Check if a bytes is implicitly converted to std::vector<uint8_t>, issue #1807"""
# assert m.func_with_vector_uint8_t_arg([ord(c) for c in b'abc']) == 3
# with pytest.raises(TypeError):
# m.func_with_vector_uint8_t_arg('stringval')


def test_stl_ownership():
cstats = ConstructorStats.get(m.Placeholder)
assert cstats.alive() == 0
Expand Down