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/PySide2/glue/qtuitools.cpp | |
| 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/PySide2/glue/qtuitools.cpp')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtuitools.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sources/pyside2/PySide2/glue/qtuitools.cpp b/sources/pyside2/PySide2/glue/qtuitools.cpp index d81f6205a..08dc0eb0a 100644 --- a/sources/pyside2/PySide2/glue/qtuitools.cpp +++ b/sources/pyside2/PySide2/glue/qtuitools.cpp @@ -116,14 +116,10 @@ Arguments: %PYARG_1 (uifile) */ // 1. Generate the Python code from the UI file -#ifdef IS_PY3K PyObject *strObj = PyUnicode_AsUTF8String(%PYARG_1); char *arg1 = PyBytes_AsString(strObj); QByteArray uiFileName(arg1); Py_DECREF(strObj); -#else -QByteArray uiFileName(PyBytes_AsString(%PYARG_1)); -#endif QFile uiFile(uiFileName); @@ -207,12 +203,7 @@ if (codeUi.isNull()) { qCritical() << "Error while compiling the generated Python file"; Py_RETURN_NONE; } -PyObject *uiObj = nullptr; -#ifdef IS_PY3K -uiObj = PyEval_EvalCode(codeUi, loc, loc); -#else -uiObj = PyEval_EvalCode(reinterpret_cast<PyCodeObject *>(codeUi.object()), loc, loc); -#endif +PyObject *uiObj = PyEval_EvalCode(codeUi, loc, loc); if (uiObj == nullptr) { qCritical() << "Error while running exec() on the generated code"; @@ -234,13 +225,8 @@ if (codeBaseClass.isNull()) { Py_RETURN_NONE; } -#ifdef IS_PY3K PyObject *classObj = PyEval_EvalCode(codeClass, loc, loc); PyObject *baseClassObj = PyEval_EvalCode(codeBaseClass, loc, loc); -#else -PyObject *classObj = PyEval_EvalCode(reinterpret_cast<PyCodeObject *>(codeClass.object()), loc, loc); -PyObject *baseClassObj = PyEval_EvalCode(reinterpret_cast<PyCodeObject *>(codeBaseClass.object()), loc, loc); -#endif %PYARG_0 = PyTuple_New(2); if (%PYARG_0 == nullptr) { |