restoring original behavior, only leaving the new lambda function in test_stl.cpp

parent 011663df
...@@ -144,11 +144,15 @@ template <typename Type, typename Value> struct list_caster { ...@@ -144,11 +144,15 @@ template <typename Type, typename Value> struct list_caster {
using value_conv = make_caster<Value>; using value_conv = make_caster<Value>;
bool load(handle src, bool convert) { bool load(handle src, bool convert) {
#if 1
if (!isinstance<sequence>(src) || isinstance<str>(src))
#else
if (!isinstance<sequence>(src) || ( if (!isinstance<sequence>(src) || (
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
!isinstance<bytes>(src) && !isinstance<bytes>(src) &&
#endif #endif
isinstance<str>(src))) isinstance<str>(src)))
#endif
return false; return false;
auto s = reinterpret_borrow<sequence>(src); auto s = reinterpret_borrow<sequence>(src);
value.clear(); value.clear();
......
...@@ -245,11 +245,11 @@ def test_function_with_string_and_vector_string_arg(): ...@@ -245,11 +245,11 @@ def test_function_with_string_and_vector_string_arg():
assert m.func_with_string_or_vector_string_arg_overload("A") == 3 assert m.func_with_string_or_vector_string_arg_overload("A") == 3
def test_bytes_to_vector_uint8_t(): #def test_bytes_to_vector_uint8_t():
"""Check if a bytes is implicitly converted to std::vector<uint8_t>, issue #1807""" # """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 # assert m.func_with_vector_uint8_t_arg([ord(c) for c in b'abc']) == 3
with pytest.raises(TypeError): # with pytest.raises(TypeError):
m.func_with_vector_uint8_t_arg('stringval') # m.func_with_vector_uint8_t_arg('stringval')
def test_stl_ownership(): def test_stl_ownership():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment