1 files changed, 18 insertions, 15 deletions

diff --git a/sources/shiboken6/libshiboken/signature/signature.cpp b/sources/shiboken6/libshiboken/signature/signature.cpp
index f83618779..3255cb56d 100644
--- a/sources/shiboken6/libshiboken/signature/signature.cpp
+++ b/sources/shiboken6/libshiboken/signature/signature.cpp
@@ -197,7 +197,7 @@ PyObject *GetSignature_Wrapper(PyObject *ob, PyObject *modifier)
     PyObject *props = PyDict_GetItem(dict, func_name);
     if (props == nullptr) {
         // handle `__init__` like the class itself
-        if (strcmp(String::toCString(func_name), "__init__") == 0)
+        if (PyUnicode_CompareWithASCIIString(func_name, "__init__") == 0)
             return GetSignature_TypeMod(objclass, modifier);
         Py_RETURN_NONE;
     }
@@ -227,6 +227,8 @@ PyObject *GetSignature_TypeMod(PyObject *ob, PyObject *modifier)
 // The `modifier` argument is a string that is passed in from `loader.py`.
 // Configuration what the modifiers mean is completely in Python.
 //
+// PYSIDE-2101: The __signature__ attribute is gone due to rlcompleter.
+//
 
 PyObject *get_signature_intern(PyObject *ob, PyObject *modifier)
 {
@@ -246,6 +248,9 @@ PyObject *get_signature_intern(PyObject *ob, PyObject *modifier)
         return pyside_tp_get___signature__(ob, modifier);
     if (Py_TYPE(ob) == &PyWrapperDescr_Type)
         return pyside_wd_get___signature__(ob, modifier);
+    // For classmethods we use the simple wrapper description implementation.
+    if (Py_TYPE(ob) == &PyClassMethodDescr_Type)
+        return pyside_wd_get___signature__(ob, modifier);
     return nullptr;
 }
 
@@ -302,7 +307,7 @@ static PyObject *feature_import(PyObject * /* self */, PyObject *args, PyObject
 PyMethodDef signature_methods[] = {
     {"__feature_import__", (PyCFunction)feature_import, METH_VARARGS | METH_KEYWORDS, nullptr},
     {"get_signature", (PyCFunction)get_signature, METH_VARARGS,
-        "get the __signature__, but pass an optional string parameter"},
+        "get the signature, passing an optional string parameter"},
     {nullptr, nullptr, 0, nullptr}
 };
 
@@ -385,9 +390,7 @@ PyObject *PySide_BuildSignatureProps(PyObject *type_key)
 #ifdef PYPY_VERSION
 static bool get_lldebug_flag()
 {
-    PyObject *sysmodule = PyImport_AddModule("sys");
-    auto *dic = PyModule_GetDict(sysmodule);
-    dic = PyDict_GetItemString(dic, "pypy_translation_info");
+    auto *dic = PySys_GetObject("pypy_translation_info");
     int lldebug = PyObject_IsTrue(PyDict_GetItemString(dic, "translation.lldebug"));
     int lldebug0 = PyObject_IsTrue(PyDict_GetItemString(dic, "translation.lldebug0"));
     return lldebug || lldebug0;
@@ -428,8 +431,6 @@ static int PySide_FinishSignatures(PyObject *module, const char *signatures[])
         if (PyCFunction_Check(func))
             if (PyDict_SetItem(pyside_globals->map_dict, func, module) < 0)
                 return -1;
-    if (_finish_nested_classes(obdict) < 0)
-        return -1;
     // The finish_import function will not work the first time since phase 2
     // was not yet run. But that is ok, because the first import is always for
     // the shiboken module (or a test module).
@@ -451,10 +452,12 @@ static int PySide_FinishSignatures(PyObject *module, const char *signatures[])
 
 int InitSignatureStrings(PyTypeObject *type, const char *signatures[])
 {
+    // PYSIDE-2404: This function now also builds the mapping for static methods.
+    //              It was one missing spot to let Lazy import work.
     init_shibokensupport_module();
     auto *ob_type = reinterpret_cast<PyObject *>(type);
     int ret = PySide_BuildSignatureArgs(ob_type, signatures);
-    if (ret < 0) {
+    if (ret < 0 || _build_func_to_type(ob_type) < 0) {
         PyErr_Print();
         PyErr_SetNone(PyExc_ImportError);
     }
@@ -471,6 +474,8 @@ void FinishSignatureInitialization(PyObject *module, const char *signatures[])
      * Still, it is not possible to call init phase 2 from here,
      * because the import is still running. Do it from Python!
      */
+    init_shibokensupport_module();
+
 #ifndef PYPY_VERSION
     static const bool patch_types = true;
 #else
@@ -534,7 +539,7 @@ static PyObject *adjustFuncName(const char *func_name)
 
     // Find the feature flags
     auto type = reinterpret_cast<PyTypeObject *>(obtype.object());
-    auto dict = type->tp_dict;
+    AutoDecRef dict(PepType_GetDict(type));
     int id = currentSelectId(type);
     id = id < 0 ? 0 : id;   // if undefined, set to zero
     auto lower = id & 0x01;
@@ -583,7 +588,9 @@ void SetError_Argument(PyObject *args, const char *func_name, PyObject *info)
         PyObject *e, *v, *t;
         // Note: These references are all borrowed.
         PyErr_Fetch(&e, &v, &t);
+        Py_DECREF(e);
         info = v;
+        Py_XDECREF(t);
     }
     // PYSIDE-1019: Modify the function name expression according to feature.
     AutoDecRef new_func_name(adjustFuncName(func_name));
@@ -614,14 +621,10 @@ void SetError_Argument(PyObject *args, const char *func_name, PyObject *info)
  * But the __doc__ attribute existed already by inheritance, and calling
  * PyType_Modified() is not supported. So we added the getsets explicitly
  * to the metatype.
+ *
+ * PYSIDE-2101: The __signature__ attribute is gone due to rlcompleter.
  */
 
-PyObject *Sbk_TypeGet___signature__(PyObject *ob, PyObject *modifier)
-{
-    init_shibokensupport_module();
-    return pyside_tp_get___signature__(ob, modifier);
-}
-
 PyObject *Sbk_TypeGet___doc__(PyObject *ob)
 {
     init_shibokensupport_module();