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

Relax py::pickle() get/set type check

Browse Source 
Fixes #1061.

`T` and `const T &` are compatible types.
This commit is contained in:
Dean Moldovan 2017-09-04 23:46:11 +02:00
parent 7939f4b3fe
commit 00b8f3655d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -17,6 +17,9 @@ v2.2.1 (Not yet released)
* Fixed a regression where the ``py::keep_alive`` policy could not be applied * Fixed a regression where the ``py::keep_alive`` policy could not be applied
to constructors. `#1065 <https://github.com/pybind/pybind11/pull/1065>`_. to constructors. `#1065 <https://github.com/pybind/pybind11/pull/1065>`_.
* Relax overly strict ``py::picke()`` check for matching get and set types.
`#1064 <https://github.com/pybind/pybind11/pull/1064>`_.
v2.2.0 (August 31, 2017) v2.2.0 (August 31, 2017)
----------------------------------------------------- -----------------------------------------------------

2
include/pybind11/detail/init.h
View File

@ -293,7 +293,7 @@ struct pickle_factory;
template <typename Get, typename Set, template <typename Get, typename Set,
typename RetState, typename Self, typename NewInstance, typename ArgState> typename RetState, typename Self, typename NewInstance, typename ArgState>
struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> { struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> {
static_assert(std::is_same<RetState, ArgState>::value, static_assert(std::is_same<intrinsic_t<RetState>, intrinsic_t<ArgState>>::value,
"The type returned by `__getstate__` must be the same " "The type returned by `__getstate__` must be the same "
"as the argument accepted by `__setstate__`"); "as the argument accepted by `__setstate__`");

2
tests/test_pickling.cpp
View File

@ -115,7 +115,7 @@ TEST_SUBMODULE(pickling, m) {
[](py::object self) { [](py::object self) {
return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__")); return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
}, },
[](py::tuple t) { [](const py::tuple &t) {
if (t.size() != 3) if (t.size() != 3)
throw std::runtime_error("Invalid state!"); throw std::runtime_error("Invalid state!");