1 files changed, 22 insertions, 10 deletions

diff --git a/sources/shiboken2/libshiboken/signature.cpp b/sources/shiboken2/libshiboken/signature.cpp
index 7eaf35e1c..07ef366ba 100644
--- a/sources/shiboken2/libshiboken/signature.cpp
+++ b/sources/shiboken2/libshiboken/signature.cpp
@@ -188,8 +188,12 @@ _get_class_of_descr(PyObject *ob)
 }
 
 static PyObject *
-GetClassOfFunc(PyObject *ob)
+GetClassOrModOf(PyObject *ob)
 {
+    /*
+     * Return the type or module of a function or type.
+     * The purpose is finally to use the name of the object.
+     */
     if (PyType_Check(ob)) {
         // PySide-928: The type case must do refcounting like the others as well.
         Py_INCREF(ob);
@@ -203,7 +207,7 @@ GetClassOfFunc(PyObject *ob)
         return _get_class_of_descr(ob);
     if (Py_TYPE(ob) == &PyWrapperDescr_Type)
         return _get_class_of_descr(ob);
-    Py_FatalError("unexpected type in GetClassOfFunc");
+    Py_FatalError("unexpected type in GetClassOrModOf");
     return nullptr;
 }
 
@@ -228,7 +232,7 @@ compute_name_key(PyObject *ob)
     if (PyType_Check(ob))
         return GetTypeKey(ob);
     Shiboken::AutoDecRef func_name(get_funcname(ob));
-    Shiboken::AutoDecRef type_key(GetTypeKey(GetClassOfFunc(ob)));
+    Shiboken::AutoDecRef type_key(GetTypeKey(GetClassOrModOf(ob)));
     return Py_BuildValue("(OO)", type_key.object(), func_name.object());
 }
 
@@ -268,7 +272,7 @@ name_key_to_func(PyObject *ob)
     PyObject *ret = PyDict_GetItem(pyside_globals->map_dict, name_key);
     if (ret == nullptr) {
         // do a lazy initialization
-        Shiboken::AutoDecRef type_key(GetTypeKey(GetClassOfFunc(ob)));
+        Shiboken::AutoDecRef type_key(GetTypeKey(GetClassOrModOf(ob)));
         PyObject *type = PyDict_GetItem(pyside_globals->map_dict,
                                         type_key);
         if (type == nullptr)
@@ -365,7 +369,7 @@ GetSignature_Function(PyObject *obfunc, const char *modifier)
     // make sure that we look into PyCFunction, only...
     if (Py_TYPE(obfunc) == PepFunction_TypePtr)
         Py_RETURN_NONE;
-    Shiboken::AutoDecRef obtype_mod(GetClassOfFunc(obfunc));
+    Shiboken::AutoDecRef obtype_mod(GetClassOrModOf(obfunc));
     Shiboken::AutoDecRef type_key(GetTypeKey(obtype_mod));
     if (type_key.isNull())
         Py_RETURN_NONE;
@@ -682,10 +686,16 @@ handle_doc(PyObject *ob, PyObject *old_descr)
 {
     init_module_1();
     init_module_2();
-    Shiboken::AutoDecRef ob_type(GetClassOfFunc(ob));
-    auto *type = reinterpret_cast<PyTypeObject *>(ob_type.object());
-    if (handle_doc_in_progress || strncmp(type->tp_name, "PySide2.", 8) != 0)
-        return PyObject_CallMethod(old_descr, const_cast<char *>("__get__"), const_cast<char *>("(O)"), ob);
+    Shiboken::AutoDecRef ob_type_mod(GetClassOrModOf(ob));
+    const char *name;
+    if (PyModule_Check(ob_type_mod))
+        name = PyModule_GetName(ob_type_mod);
+    else
+        name = reinterpret_cast<PyTypeObject *>(ob_type_mod.object())->tp_name;
+    if (handle_doc_in_progress || name == nullptr
+        || strncmp(name, "PySide2.", 8) != 0)
+        return PyObject_CallMethod(old_descr, const_cast<char *>("__get__"),
+            const_cast<char *>("(O)"), ob);
     handle_doc_in_progress++;
     PyObject *res = PyObject_CallFunction(
                         pyside_globals->make_helptext_func,
@@ -728,7 +738,9 @@ static int
 pyside_set___signature__(PyObject *op, PyObject *value)
 {
     // By this additional check, this function refuses write access.
-    if (get_signature_intern(op, nullptr)) {
+    // We consider both nullptr and Py_None as not been written.
+    Shiboken::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);