aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2020-09-14 14:17:07 +0100
committerDavid Shah <dave@ds0.me>2020-09-14 14:17:07 +0100
commitb5e5f8d85f7c65bcd8c824000f2f6c3c5210ab4d (patch)
tree73f765217b2a640d42d24095a42adfff970762a4
parent4512a9de19751916c466ed12a2ba4dce958d77bc (diff)
downloadnextpnr-b5e5f8d85f7c65bcd8c824000f2f6c3c5210ab4d.tar.gz
nextpnr-b5e5f8d85f7c65bcd8c824000f2f6c3c5210ab4d.tar.bz2
nextpnr-b5e5f8d85f7c65bcd8c824000f2f6c3c5210ab4d.zip
python: Fix handling of None in pybind11
Signed-off-by: David Shah <dave@ds0.me>
-rw-r--r--common/pywrappers.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/common/pywrappers.h b/common/pywrappers.h
index a864d8cf..d7e65e50 100644
--- a/common/pywrappers.h
+++ b/common/pywrappers.h
@@ -156,7 +156,7 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv> struct fn_
try {
return py::cast(rv_conv()(ctx, (base.*fn)()));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}
@@ -177,7 +177,7 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv, typename a
try {
return py::cast(rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1))));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}
@@ -200,7 +200,7 @@ struct fn_wrapper_2a
try {
return py::cast(rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2))));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}
@@ -226,7 +226,7 @@ struct fn_wrapper_3a
return py::cast(
rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2), arg3_conv()(ctx, arg3))));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}
@@ -415,7 +415,7 @@ template <typename Class, typename MemT, MemT mem, typename v_conv> struct reado
try {
return py::cast(v_conv()(ctx, (base.*mem)));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}
@@ -438,7 +438,7 @@ template <typename Class, typename MemT, MemT mem, typename get_conv, typename s
try {
return py::cast(get_conv()(ctx, (base.*mem)));
} catch (bad_wrap &) {
- return py::object();
+ return py::none();
}
}