python311 fix

skoslowski · skoslowski · commit fe5a3528bcac · 2024-01-19T11:37:09.000+01:00
diff --git a/src/PythonQt.cpp b/src/PythonQt.cpp
@@ -2375,25 +2375,27 @@ QString PythonQtPrivate::getSignature(PyObject* object)
       //       inspect.getargs() can handle anonymous (tuple) arguments, while this code does not.
       //       It can be implemented, but it may be rarely needed and not necessary.
       PyCodeObject* code = (PyCodeObject*)func->func_code;
-      if (code->co_varnames) {
+      auto varnames = PyCode_GetVarnames(code);
+      if (varnames) {
         int nargs = code->co_argcount;
-        Q_ASSERT(PyTuple_Check(code->co_varnames));
+        Q_ASSERT(PyTuple_Check(varnames));
         for (int i=0; i<nargs; i++) {
-          PyObject* name = PyTuple_GetItem(code->co_varnames, i);
+          PyObject* name = PyTuple_GetItem(varnames, i);
           Q_ASSERT(PyString_Check(name));
           arguments << PyString_AsString(name);
         }
         if (code->co_flags & CO_VARARGS) {
-          PyObject* s = PyTuple_GetItem(code->co_varnames, nargs);
+          PyObject* s = PyTuple_GetItem(varnames, nargs);
           Q_ASSERT(PyString_Check(s));
           varargs = PyString_AsString(s);
           nargs += 1;
         }
         if (code->co_flags & CO_VARKEYWORDS) {
-          PyObject* s = PyTuple_GetItem(code->co_varnames, nargs);
+          PyObject* s = PyTuple_GetItem(varnames, nargs);
           Q_ASSERT(PyString_Check(s));
           varkeywords = PyString_AsString(s);
         }
+        Py_DECREF(varnames);
       }
 
       PyObject* defaultsTuple = func->func_defaults;
diff --git a/src/PythonQtClassWrapper.h b/src/PythonQtClassWrapper.h
@@ -49,7 +49,7 @@
 #include "structmember.h"
 #include "methodobject.h"
 #include "compile.h"
-#include "eval.h"
+// #include "eval.h"
 #include <QString>
 
 class PythonQtClassInfo;
diff --git a/src/PythonQtInstanceWrapper.h b/src/PythonQtInstanceWrapper.h
@@ -51,7 +51,7 @@
 #include "structmember.h"
 #include "methodobject.h"
 #include "compile.h"
-#include "eval.h"
+// #include "eval.h"
 
 class PythonQtClassInfo;
 class QObject;
@@ -64,7 +64,7 @@ struct PythonQtInstanceWrapper {
   PyObject_HEAD
 
   //! the class information, this is set even if the _obj or _wrappedPtr is NULL to support typed NULL pointers
-  inline PythonQtClassInfo* classInfo() 
+  inline PythonQtClassInfo* classInfo()
   {  return ((PythonQtClassWrapper*)Py_TYPE(this))->_classInfo; }
 
   inline PythonQtDynamicClassInfo* dynamicClassInfo()
@@ -133,4 +133,3 @@ int PythonQtInstanceWrapper_init(PythonQtInstanceWrapper * self, PyObject * args
 PyObject *PythonQtInstanceWrapper_delete(PythonQtInstanceWrapper * self);
 
 #endif
-
diff --git a/src/PythonQtSignalReceiver.cpp b/src/PythonQtSignalReceiver.cpp
@@ -45,7 +45,7 @@
 #include "PythonQtConversion.h"
 #include <QMetaObject>
 #include <QMetaMethod>
-#include "funcobject.h"
+// #include "funcobject.h"
 
 // use -2 to signal that the variable is uninitialized
 int PythonQtSignalReceiver::_destroyedSignal1Id = -2;
@@ -279,4 +279,3 @@ int PythonQtSignalReceiver::qt_metacall(QMetaObject::Call c, int id, void **argu
   }
   return 0;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`#include "PythonQtConversion.h"`
`46`	`46`	`#include <QMetaObject>`
`47`	`47`	`#include <QMetaMethod>`
`48`		`-#include "funcobject.h"`
	`48`	`+// #include "funcobject.h"`
`49`	`49`
`50`	`50`	`// use -2 to signal that the variable is uninitialized`
`51`	`51`	`int PythonQtSignalReceiver::_destroyedSignal1Id = -2;`
`@@ -279,4 +279,3 @@ int PythonQtSignalReceiver::qt_metacall(QMetaObject::Call c, int id, void **argu`
`279`	`279`	`}`
`280`	`280`	`return 0;`
`281`	`281`	`}`
`282`		`-`