diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-02 15:50:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:22:13 +0000 |
| commit | a5848518433a7adf1ca83b19441a1abe6734d8a9 (patch) | |
| tree | c88f23cebd3636399f4ee1f31acd8c3e6d561a40 /sources/pyside2/libpyside | |
| parent | 9dd6617b0228d5aa35bd7747560161a3f28c9c47 (diff) | |
Remove Python2 from C++ code
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I7e4ffaeabb2ac8a5ffe165d43b3475a7e5d57447
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/libpyside')
| -rw-r--r-- | sources/pyside2/libpyside/globalreceiverv2.cpp | 7 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/pysideqflags.cpp | 8 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/pysidesignal.cpp | 4 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp | 21 |
5 files changed, 0 insertions, 42 deletions
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp index 0377f7697..b1e75ad8e 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.cpp +++ b/sources/pyside2/libpyside/globalreceiverv2.cpp @@ -100,9 +100,6 @@ DynamicSlotDataV2::DynamicSlotDataV2(PyObject *callback, GlobalReceiverV2 *paren //Can not store calback pointe because this will be destroyed at the end of the scope //To avoid increment intance reference keep the callback information m_callback = PyMethod_GET_FUNCTION(callback); -#ifndef IS_PY3K - m_pyClass = PyMethod_GET_CLASS(callback); -#endif m_pythonSelf = PyMethod_GET_SELF(callback); //monitor class from method lifetime @@ -140,11 +137,7 @@ PyObject *DynamicSlotDataV2::callback() //create a callback based on method data if (m_isMethod) -#ifdef IS_PY3K callback = PyMethod_New(m_callback, m_pythonSelf); -#else - callback = PyMethod_New(m_callback, m_pythonSelf, m_pyClass); -#endif else Py_INCREF(callback); diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index 66e931164..7c8f99b93 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -473,13 +473,11 @@ QString pyStringToQString(PyObject *str) { if (str == Py_None) return QString(); -#ifdef IS_PY3K if (PyUnicode_Check(str)) { const char *unicodeBuffer = _PepUnicode_AsString(str); if (unicodeBuffer) return QString::fromUtf8(unicodeBuffer); } -#endif if (PyBytes_Check(str)) { const char *asciiBuffer = PyBytes_AS_STRING(str); if (asciiBuffer) diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp index b141ce157..b07a73332 100644 --- a/sources/pyside2/libpyside/pysideqflags.cpp +++ b/sources/pyside2/libpyside/pysideqflags.cpp @@ -141,21 +141,13 @@ namespace PySide namespace QFlags { static PyType_Slot SbkNewQFlagsType_slots[] = { -#ifdef IS_PY3K {Py_nb_bool, 0}, -#else - {Py_nb_nonzero, 0}, - {Py_nb_long, 0}, -#endif {Py_nb_invert, 0}, {Py_nb_and, 0}, {Py_nb_xor, 0}, {Py_nb_or, 0}, {Py_nb_int, reinterpret_cast<void*>(qflag_int)}, {Py_nb_index, reinterpret_cast<void*>(qflag_int)}, -#ifndef IS_PY3K - {Py_nb_long, 0}, -#endif {Py_tp_new, (void *)PySideQFlagsNew}, {Py_tp_richcompare, (void *)PySideQFlagsRichCompare}, {Py_tp_dealloc, (void *)Sbk_object_dealloc}, diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp index aa215aa45..195bedaa4 100644 --- a/sources/pyside2/libpyside/pysidesignal.cpp +++ b/sources/pyside2/libpyside/pysidesignal.cpp @@ -226,13 +226,9 @@ int signalTpInit(PyObject *self, PyObject *args, PyObject *kwds) Py_ssize_t argument_size = PySequence_Size(argArguments); for (Py_ssize_t i = 0; i < argument_size; ++i) { PyObject *item = PySequence_GetItem(argArguments, i); -#ifdef IS_PY3K PyObject *strObj = PyUnicode_AsUTF8String(item); char *s = PyBytes_AsString(strObj); Py_DECREF(strObj); -#else - char *s = PyBytes_AsString(item); -#endif Py_DECREF(item); if (s != nullptr) data->data->signalArguments->append(QByteArray(s)); diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp index 7ac69843f..69ee67932 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp +++ b/sources/pyside2/libpyside/signalmanager.cpp @@ -85,7 +85,6 @@ namespace { static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args); static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args); -#ifdef IS_PY3K static void destroyMetaObject(PyObject *obj) { void *ptr = PyCapsule_GetPointer(obj, 0); @@ -95,17 +94,6 @@ namespace { Shiboken::BindingManager::instance().releaseWrapper(wrapper); delete meta; } - -#else - static void destroyMetaObject(void *obj) - { - auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(obj); - SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); - if (wrapper) - Shiboken::BindingManager::instance().releaseWrapper(wrapper); - delete meta; - } -#endif } namespace PySide { @@ -569,11 +557,7 @@ static MetaObjectBuilder *metaBuilderFromDict(PyObject *dict) // PyDict_GetItem would touch PyThreadState_GET and the global error state. // PyDict_GetItemWithError instead can work without GIL. PyObject *pyBuilder = PyDict_GetItemWithError(dict, metaObjectAttr); -#ifdef IS_PY3K return reinterpret_cast<MetaObjectBuilder *>(PyCapsule_GetPointer(pyBuilder, nullptr)); -#else - return reinterpret_cast<MetaObjectBuilder *>(PyCObject_AsVoidPtr(pyBuilder)); -#endif } int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signature, QMetaMethod::MethodType type) @@ -599,12 +583,7 @@ int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signa // Create a instance meta object if (!dmo) { dmo = new MetaObjectBuilder(Py_TYPE(pySelf), metaObject); -#ifdef IS_PY3K PyObject *pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject); -#else - PyObject *pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject); -#endif - PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo); Py_DECREF(pyDmo); } |