1 files changed, 5 insertions, 43 deletions

diff --git a/sources/shiboken6/libshiboken/signature/signature_extend.cpp b/sources/shiboken6/libshiboken/signature/signature_extend.cpp
index 047b0e0e4..7292f8216 100644
--- a/sources/shiboken6/libshiboken/signature/signature_extend.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature_extend.cpp
@@ -58,32 +58,26 @@ static PyObject *_get_written_signature(signaturefunc sf, PyObject *ob, PyObject
 #ifdef PYPY_VERSION
 PyObject *pyside_bm_get___signature__(PyObject *func, PyObject *modifier)
 {
-    init_module_2();
     return _get_written_signature(GetSignature_Method, func, modifier);
 }
 #endif
 
 PyObject *pyside_cf_get___signature__(PyObject *func, PyObject *modifier)
 {
-    init_module_2();
     return _get_written_signature(GetSignature_Function, func, modifier);
 }
 
 PyObject *pyside_sm_get___signature__(PyObject *sm, PyObject *modifier)
 {
-    init_module_2();
     AutoDecRef func(PyObject_GetAttr(sm, PyMagicName::func()));
-    if (Py_TYPE(func) == PepFunction_TypePtr)
-        return PyObject_GetAttr(func, PyMagicName::signature());
     return _get_written_signature(GetSignature_Function, func, modifier);
 }
 
 PyObject *pyside_md_get___signature__(PyObject *ob_md, PyObject *modifier)
 {
-    init_module_2();
     AutoDecRef func(name_key_to_func(ob_md));
     if (func.object() == Py_None)
-        return Py_None;
+        Py_RETURN_NONE;
     if (func.isNull())
         Py_FatalError("missing mapping in MethodDescriptor");
     return pyside_cf_get___signature__(func, modifier);
@@ -91,13 +85,11 @@ PyObject *pyside_md_get___signature__(PyObject *ob_md, PyObject *modifier)
 
 PyObject *pyside_wd_get___signature__(PyObject *ob, PyObject *modifier)
 {
-    init_module_2();
     return _get_written_signature(GetSignature_Wrapper, ob, modifier);
 }
 
 PyObject *pyside_tp_get___signature__(PyObject *obtype_mod, PyObject *modifier)
 {
-    init_module_2();
     return _get_written_signature(GetSignature_TypeMod, obtype_mod, modifier);
 }
 
@@ -127,17 +119,17 @@ static int handle_doc_in_progress = 0;
 
 static PyObject *handle_doc(PyObject *ob, PyObject *old_descr)
 {
-    init_module_1();
-    init_module_2();
     AutoDecRef ob_type_mod(GetClassOrModOf(ob));
     const char *name;
-    if (PyModule_Check(ob_type_mod.object()))
+    bool isModule = PyModule_Check(ob_type_mod.object());
+    if (isModule)
         name = PyModule_GetName(ob_type_mod.object());
     else
         name = reinterpret_cast<PyTypeObject *>(ob_type_mod.object())->tp_name;
     PyObject *res{};
 
-    if (handle_doc_in_progress || name == nullptr || strncmp(name, "PySide6.", 8) != 0) {
+    if (handle_doc_in_progress || name == nullptr
+        || (isModule && strncmp(name, "PySide6.", 8) != 0)) {
         res = PyObject_CallMethodObjArgs(old_descr, PyMagicName::get(), ob, nullptr);
     } else {
         handle_doc_in_progress++;
@@ -177,59 +169,29 @@ static PyObject *pyside_wd_get___doc__(PyObject *wd)
     return handle_doc(wd, old_wd_doc_descr);
 }
 
-// the default setter for all objects
-static int pyside_set___signature__(PyObject *op, PyObject *value)
-{
-    // By this additional check, this function refuses write access.
-    // We consider both nullptr and Py_None as not been written.
-    AutoDecRef has_val(get_signature_intern(op, nullptr));
-    if (!(has_val.isNull() || has_val == Py_None)) {
-        PyErr_Format(PyExc_AttributeError,
-                     "Attribute '__signature__' of '%.50s' object is not writable",
-                     Py_TYPE(op)->tp_name);
-        return -1;
-    }
-    int ret = value == nullptr ? PyDict_DelItem(pyside_globals->value_dict, op)
-                               : PyDict_SetItem(pyside_globals->value_dict, op, value);
-    Py_XINCREF(value);
-    return ret;
-}
-
 // PYSIDE-535: We cannot patch types easily in PyPy.
 //             Let's use the `get_signature` function, instead.
 static PyGetSetDef new_PyCFunction_getsets[] = {
     {const_cast<char *>("__doc__"),       reinterpret_cast<getter>(pyside_cf_get___doc__),
                                           nullptr, nullptr, nullptr},
-    {const_cast<char *>("__signature__"), reinterpret_cast<getter>(pyside_cf_get___signature__),
-                                          reinterpret_cast<setter>(pyside_set___signature__),
-                                          nullptr, nullptr},
     {nullptr, nullptr, nullptr, nullptr, nullptr}
 };
 
 static PyGetSetDef new_PyStaticMethod_getsets[] = {
     {const_cast<char *>("__doc__"),       reinterpret_cast<getter>(pyside_sm_get___doc__),
                                           nullptr, nullptr, nullptr},
-    {const_cast<char *>("__signature__"), reinterpret_cast<getter>(pyside_sm_get___signature__),
-                                          reinterpret_cast<setter>(pyside_set___signature__),
-                                          nullptr, nullptr},
     {nullptr, nullptr, nullptr, nullptr, nullptr}
 };
 
 static PyGetSetDef new_PyMethodDescr_getsets[] = {
     {const_cast<char *>("__doc__"),       reinterpret_cast<getter>(pyside_md_get___doc__),
                                           nullptr, nullptr, nullptr},
-    {const_cast<char *>("__signature__"), reinterpret_cast<getter>(pyside_md_get___signature__),
-                                          reinterpret_cast<setter>(pyside_set___signature__),
-                                          nullptr, nullptr},
     {nullptr, nullptr, nullptr, nullptr, nullptr}
 };
 
 static PyGetSetDef new_PyWrapperDescr_getsets[] = {
     {const_cast<char *>("__doc__"),       reinterpret_cast<getter>(pyside_wd_get___doc__),
                                           nullptr, nullptr, nullptr},
-    {const_cast<char *>("__signature__"), reinterpret_cast<getter>(pyside_wd_get___signature__),
-                                          reinterpret_cast<setter>(pyside_set___signature__),
-                                          nullptr, nullptr},
     {nullptr, nullptr, nullptr, nullptr, nullptr}
 };