Skip to content

chore(importer): read sys.flags (verbose/optimize) on Python >= 3.12; fallback to legacy globals #311

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 2 commits into from
Sep 26, 2025
+54 −8
Merged

chore(importer): read sys.flags (verbose/optimize) on Python >= 3.12; fallback to legacy globals #311

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3487676
chore(importer): read `sys.flags` (verbose/optimize) on Python >= 3.1…
hjmjohnson Jun 27, 2025
c4c4aed
chore(importer): add helpers for runtime flags
jcfr Sep 26, 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
67 changes: 62 additions & 5 deletions src/PythonQtImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,26 @@ struct st_mlab_searchorder {
extern PyTypeObject PythonQtImporter_Type;
PyObject *PythonQtImportError;

namespace
{
int getSysFlag(const char* flag_name)
{
PyObject* flags = PySys_GetObject("flags");
if (!flags) {
return false;
}
PyObject* flag = PyObject_GetAttrString(flags, flag_name);
if (!flag) {
PyErr_Clear(); return false;
}
int flag_value = (int)PyLong_AsLong(flag);
Py_DECREF(flag);
if (PyErr_Occurred()) { PyErr_Clear(); return 0; };
return flag_value;
}

}

QString PythonQtImport::getSubName(const QString& str)
{
int idx = str.lastIndexOf('.');
Expand Down Expand Up @@ -308,7 +328,11 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
}

Py_DECREF(code);
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr("import %s # loaded from %s\n",
fullname, QStringToPythonConstCharPointer(fullPath));
}
Expand Down Expand Up @@ -555,9 +579,14 @@ void PythonQtImport::writeCompiledModule(PyCodeObject *co, const QString& filena
}
fp = open_exclusive(filename);
if (fp == nullptr) {
if (Py_VerboseFlag)
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr(
"# can't create %s\n", QStringToPythonConstCharPointer(filename));
}
return;
}
PyMarshal_WriteLongToFile(PyImport_GetMagicNumber(), fp, Py_MARSHAL_VERSION);
Expand All @@ -566,8 +595,13 @@ void PythonQtImport::writeCompiledModule(PyCodeObject *co, const QString& filena
PyMarshal_WriteLongToFile(sourceSize, fp, Py_MARSHAL_VERSION);
PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION);
if (ferror(fp)) {
if (Py_VerboseFlag)
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr("# can't write %s\n", QStringToPythonConstCharPointer(filename));
}
/* Don't keep partial file */
fclose(fp);
QFile::remove(filename);
Expand All @@ -578,7 +612,11 @@ void PythonQtImport::writeCompiledModule(PyCodeObject *co, const QString& filena
PyMarshal_WriteLongToFile(mtime, fp, Py_MARSHAL_VERSION);
fflush(fp);
fclose(fp);
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr("# wrote %s\n", QStringToPythonConstCharPointer(filename));
}
}
Expand All @@ -603,19 +641,29 @@ PythonQtImport::unmarshalCode(const QString& path, const QByteArray& data, time_
}

if (getLong((unsigned char *)buf) != PyImport_GetMagicNumber()) {
if (Py_VerboseFlag)
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr("# %s has bad magic\n",
QStringToPythonConstCharPointer(path));
}
Py_RETURN_NONE;
}

if (mtime != 0) {
time_t timeDiff = getLong((unsigned char *)buf + 4) - mtime;
if (timeDiff<0) { timeDiff = -timeDiff; }
if (timeDiff > 1) {
if (Py_VerboseFlag)
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose")) {
#else
if (Py_VerboseFlag) {
#endif
PySys_WriteStderr("# %s has bad mtime\n",
QStringToPythonConstCharPointer(path));
}
Py_RETURN_NONE;
}
}
Expand Down Expand Up @@ -751,9 +799,14 @@ PythonQtImport::getModuleCode(PythonQtImporter *self, const char* fullname, QStr
PyObject *code = nullptr;
test = path + zso->suffix;

if (Py_VerboseFlag > 1)
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("verbose") > 1) {
#else
if (Py_VerboseFlag > 1) {
#endif
PySys_WriteStderr("# trying %s\n",
QStringToPythonConstCharPointer(test));
}
if (PythonQt::importInterface()->exists(test)) {
time_t mtime = 0;
int ispackage = zso->type & IS_PACKAGE;
Expand Down Expand Up @@ -860,7 +913,11 @@ void PythonQtImport::init()
mlab_searchorder[0].suffix[0] = SEP;
mlab_searchorder[1].suffix[0] = SEP;
mlab_searchorder[2].suffix[0] = SEP;
#if PY_VERSION_HEX >= 0x030C0000 // Python >= 3.12
if (getSysFlag("optimize")) {
#else
if (Py_OptimizeFlag) {
#endif
/* Reverse *.pyc and *.pyo */
struct st_mlab_searchorder tmp;
tmp = mlab_searchorder[0];
Expand Down
Loading