Skip to content

chore(PythonQt): Migrate to Python-3 Unicode API; update generator/wrappers; add opt-in PyString shim; enforce Python ≥ 3 #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 26, 2025
Merged

chore(PythonQt): Migrate to Python-3 Unicode API; update generator/wrappers; add opt-in PyString shim; enforce Python ≥ 3 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
65ef625
chore(PythonQt): replace `PyString_FromString` with `PyUnicode_FromSt…
jcfr Sep 21, 2025
ff9a147
chore(PythonQt): replace `PyString_AS_STRING` with `PyUnicode_AsUTF8`
jcfr Sep 25, 2025
adaa0f7
chore(PythonQt): replace `PyString_AsString` with `PyUnicode_AsUTF8`
jcfr Sep 25, 2025
eb53f46
chore(PythonQt): replace `PyString_FromFormat` with `PyUnicode_FromFo…
jcfr Sep 25, 2025
e808b71
chore(PythonQt): replace `PyString_Check` with `PyUnicode_Check`
jcfr Sep 25, 2025
c4d00f8
chore(PythonQtPythonInclude, build/python.prf): Report error if using…
jcfr Sep 25, 2025
e676129
chore(generator): replace `PyString_FromString` with `PyUnicode_FromS…
jcfr Sep 25, 2025
e702ff0
chore(generated_cpp_*): replace `PyString_FromString` with `PyUnicode…
jcfr Sep 25, 2025
e793d1a
chore: Add support for defining PYTHONQT_USE_PYSTRING_SHIM
jcfr Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions build/python.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@ PYTHON_VERSION_MINOR=$$section(PYTHON_VERSION, ., 1, 1)
message(Using Python version $${PYTHON_VERSION})
}


# Python 2.x has problems:
# 1) https://wiki.gentoo.org/wiki/Project:Python/Strict_aliasing
# 2) deprecated implicit cast of string literals to char*
# Python 3.x is required
equals(PYTHON_VERSION_MAJOR, 2) {
gcc:QMAKE_CXXFLAGS *= -fno-strict-aliasing -Wno-write-strings
# Qt 5.4 adds this option, but this is not compatible with the Python API
msvc: QMAKE_CXXFLAGS -= -Zc:strictStrings
error("Python >= 3.x is required")
}

contains(PKGCONFIG, "python.*"){
Expand Down Expand Up @@ -73,13 +68,6 @@ contains(PKGCONFIG, "python.*"){
error("PYTHON_PATH must be set to correct folder with \\libs and \\include subfolders ")
}

#We need to destinguish 64-bit build to add a workaround option
#The only known problematic case is MinGW with external (MSVC-built) Python2
mingw:equals(PYTHON_VERSION_MAJOR, 2): isEmpty(QMAKE_TARGET.arch):system(\
$$system_quote($$system_path($${PYTHON_PATH}/python.exe)) -c \
$$system_quote(import sysconfig;exit(0 if 0 <= sysconfig.get_platform().find(\'win-amd64\') else 1))\
):DEFINES += MS_WIN64

INCLUDEPATH += $$shell_path($${PYTHON_PATH}/include)

LIBS += $$shell_path(-L$${PYTHON_PATH}/libs)
Expand Down
462 changes: 231 additions & 231 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core0.cpp
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 113 additions & 113 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core1.cpp
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 102 additions & 102 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core2.cpp
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ PythonQtShell_QVariantAnimation::~PythonQtShell_QVariantAnimation() {
void PythonQtShell_QVariantAnimation::childEvent(QChildEvent* arg__1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("childEvent");
static PyObject* name = PyUnicode_FromString("childEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "QChildEvent*"};
Expand All @@ -290,7 +290,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::customEvent(QEvent* arg__1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("customEvent");
static PyObject* name = PyUnicode_FromString("customEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "QEvent*"};
Expand All @@ -309,7 +309,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
int PythonQtShell_QVariantAnimation::duration() const
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("duration");
static PyObject* name = PyUnicode_FromString("duration");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"int"};
Expand Down Expand Up @@ -339,7 +339,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
bool PythonQtShell_QVariantAnimation::event(QEvent* event0)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("event");
static PyObject* name = PyUnicode_FromString("event");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"bool" , "QEvent*"};
Expand Down Expand Up @@ -369,7 +369,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
bool PythonQtShell_QVariantAnimation::eventFilter(QObject* arg__1, QEvent* arg__2)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("eventFilter");
static PyObject* name = PyUnicode_FromString("eventFilter");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"bool" , "QObject*" , "QEvent*"};
Expand Down Expand Up @@ -399,7 +399,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
QVariant PythonQtShell_QVariantAnimation::interpolated(const QVariant& from0, const QVariant& to1, qreal progress2) const
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("interpolated");
static PyObject* name = PyUnicode_FromString("interpolated");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"QVariant" , "const QVariant&" , "const QVariant&" , "qreal"};
Expand Down Expand Up @@ -429,7 +429,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::timerEvent(QTimerEvent* arg__1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("timerEvent");
static PyObject* name = PyUnicode_FromString("timerEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "QTimerEvent*"};
Expand All @@ -448,7 +448,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::updateCurrentTime(int arg__1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateCurrentTime");
static PyObject* name = PyUnicode_FromString("updateCurrentTime");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "int"};
Expand All @@ -467,7 +467,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::updateCurrentValue(const QVariant& value0)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateCurrentValue");
static PyObject* name = PyUnicode_FromString("updateCurrentValue");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "const QVariant&"};
Expand All @@ -486,7 +486,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::updateDirection(QAbstractAnimation::Direction direction0)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateDirection");
static PyObject* name = PyUnicode_FromString("updateDirection");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "QAbstractAnimation::Direction"};
Expand All @@ -505,7 +505,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
void PythonQtShell_QVariantAnimation::updateState(QAbstractAnimation::State newState0, QAbstractAnimation::State oldState1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateState");
static PyObject* name = PyUnicode_FromString("updateState");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"" , "QAbstractAnimation::State" , "QAbstractAnimation::State"};
Expand Down Expand Up @@ -650,7 +650,7 @@ PythonQtShell_QXmlStreamEntityResolver::~PythonQtShell_QXmlStreamEntityResolver(
QString PythonQtShell_QXmlStreamEntityResolver::resolveEntity(const QString& publicId0, const QString& systemId1)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("resolveEntity");
static PyObject* name = PyUnicode_FromString("resolveEntity");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"QString" , "const QString&" , "const QString&"};
Expand Down Expand Up @@ -680,7 +680,7 @@ if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
QString PythonQtShell_QXmlStreamEntityResolver::resolveUndeclaredEntity(const QString& name0)
{
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("resolveUndeclaredEntity");
static PyObject* name = PyUnicode_FromString("resolveUndeclaredEntity");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
static const char* argumentList[] ={"QString" , "const QString&"};
Expand Down
Loading
Loading