Implement compatbility layer for old pybind version using the existing pattern.

Author: damienmarchal

Plugin/src/SofaPython3/config.h.in

@@ -55,3 +55,18 @@
 #else
 #define SOFAPYTHON3_BIND_ATTRIBUTE_ERROR() namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
 #endif // PYBIND11_SOFA_VERSION >= 20801
+
+#if PYBIND11_SOFA_VERSION >= 20801
+#define SOFAPYTHON3_ADD_PYBIND_TYPE_FOR_OLD_VERSION()
+#else
+#define SOFAPYTHON3_ADD_PYBIND_TYPE_FOR_OLD_VERSION() namespace pybind11 { \
+class type : public pybind11::object { \
+public: \
+    PYBIND11_OBJECT(type, pybind11::object, PyType_Check) \
+    static pybind11::handle handle_of(pybind11::handle h) { return handle((PyObject*) Py_TYPE(h.ptr())); } \
+    static type of(pybind11::handle h) { return type(type::handle_of(h), borrowed_t{}); } \
+    template<typename T> static handle handle_of(); \
+    template<typename T> static type of() {return type(type::handle_of<T>(), borrowed_t{}); } \
+}; \
+}
+#endif // PYBIND11_SOFA_VERSION >= 20801

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp

@@ -45,7 +45,9 @@ using sofa::simulation::Node;
 
 #include <SofaPython3/DataHelper.h>
 
+// These two lines are there to handle deprecated version of pybind.
 SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+SOFAPYTHON3_ADD_PYBIND_TYPE_FOR_OLD_VERSION()
 
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
@@ -361,7 +363,7 @@ py::object BindingBase::__getattr__(py::object self, const std::string& attribut
     emitSpellingMessage(tmp, "   - The link named ", selfbase->getLinks(), attributeName, 2, 0.6);
 
     // Also provide spelling hints on python functions.
-    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(pybind11_compat::type::of(self).attr("__dict__")), attributeName, 5, 0.8,
+    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(py::type::of(self).attr("__dict__")), attributeName, 5, 0.8,
                         [](const std::pair<py::handle, py::handle>& kv) { return py::cast<std::string>(std::get<0>(kv)); });
 
     std::stringstream message;

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.h

@@ -30,34 +30,6 @@ namespace sofapython3 {
 template <typename T>
 using py_shared_ptr = sofa::core::sptr<T>;
 
-namespace pybind11_compat
-{
-using namespace pybind11;
-class type : public pybind11::object {
-public:
-    PYBIND11_OBJECT(type, pybind11::object, PyType_Check)
-
-    /// Return a type handle from a handle or an object
-    static pybind11::handle handle_of(pybind11::handle h) { return handle((PyObject*) Py_TYPE(h.ptr())); }
-
-    /// Return a type object from a handle or an object
-    static type of(pybind11::handle h) { return type(type::handle_of(h), borrowed_t{}); }
-
-    // Defined in pybind11/cast.h
-    /// Convert C++ type to handle if previously registered. Does not convert
-    /// standard types, like int, float. etc. yet.
-    /// See https://github.com/pybind/pybind11/issues/2486
-    template<typename T>
-    static handle handle_of();
-
-    /// Convert C++ type to type if previously registered. Does not convert
-    /// standard types, like int, float. etc. yet.
-    /// See https://github.com/pybind/pybind11/issues/2486
-    template<typename T>
-    static type of() {return type(type::handle_of<T>(), borrowed_t{}); }
-};
-}
-
 } // namespace sofapython3
 
 PYBIND11_DECLARE_HOLDER_TYPE(T, sofapython3::py_shared_ptr<T>, true)

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node.cpp

@@ -67,7 +67,9 @@ using sofa::core::objectmodel::BaseObjectDescription;
 #include <queue>
 #include <sofa/core/objectmodel/Link.h>
 
+// These two lines are there to handle deprecated version of pybind.
 SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+SOFAPYTHON3_ADD_PYBIND_TYPE_FOR_OLD_VERSION()
 
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
@@ -484,7 +486,7 @@ py::object __getattr__(py::object pyself, const std::string& name)
     emitSpellingMessage(tmp, "   - The child node named ", selfnode->getChildren(), name, 2, 0.8);
 
     // Also provide spelling hints on python functions.
-    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(pybind11_compat::type::of(pyself).attr("__dict__")), name, 5, 0.8,
+    emitSpellingMessage(tmp, "   - The python attribute named ", py::cast<py::dict>(py::type::of(pyself).attr("__dict__")), name, 5, 0.8,
                         [](const std::pair<py::handle, py::handle>& kv) { return py::cast<std::string>(std::get<0>(kv)); });
 
     std::stringstream message;