Skip to content

python-3.11 pyframeobject changes #7

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 4 commits into from
Aug 28, 2024
Merged

python-3.11 pyframeobject changes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d2f954
removed obsolete PyFrameObject.f_code field access with PyFrame_GetCo…
nicolaslg Jul 26, 2024
cffe54d
changed position of Py_DecRef to after object no longer used
nicolaslg Aug 27, 2024
d061690
Merge branch 'crash_import_module_python' into python-3.11_pyframeobj…
Aug 28, 2024
bbb8c5d
Fix python 3 console when running the import numpy command if numpy i…
Aug 28, 2024
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
2 changes: 1 addition & 1 deletion cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${Q
# Pour la bibliothèque QtPython3 :
set (QT_PYTHON_3_MAJOR_VERSION "6")
set (QT_PYTHON_3_MINOR_VERSION "4")
set (QT_PYTHON_3_RELEASE_VERSION "1")
set (QT_PYTHON_3_RELEASE_VERSION "2")
set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION})

8 changes: 4 additions & 4 deletions src/QtPython3/QtPythonConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ static void unregisterConsole (QtPythonConsole& console)

static QtPythonConsole& getConsole (PyFrameObject& frame)
{
const string fileName = PyUnicode_AsUTF8 (frame.f_code->co_filename);
const string fileName = PyUnicode_AsUTF8 (PyFrame_GetCode(&frame)->co_filename);

// Cas particulier : on n'exécute pas un fichier mais une chaîne de caractères => fileName vaut <string>
// ce qui est peu discriminant. On l'accepte si seule une console est enregistrée.
Expand Down Expand Up @@ -650,15 +650,15 @@ static int tracePythonExecution (PyObject*, PyFrameObject* frame, int what, PyOb
if (PyTrace_LINE == what) // Evènement "numéro de ligne" modifié (succès et erreur)
{
QtPythonConsole &console = getConsole (*frame);
console.lineProcessedCallback (PyUnicode_AsUTF8 (frame->f_code->co_filename), PyFrame_GetLineNumber (frame), true, string ( ));
console.lineProcessedCallback (PyUnicode_AsUTF8 (PyFrame_GetCode(frame)->co_filename), PyFrame_GetLineNumber (frame), true, string ( ));
} // if (PyTrace_RETURN == what)
else if (PyTrace_EXCEPTION == what) // Ligne en erreur
{
PyObject* pystring = PyObject_Str (obj);
Py_DecRef (pystring);
const string error= PyUnicode_AsUTF8 (pystring);
Py_DecRef (pystring);
QtPythonConsole &console = getConsole (*frame);
console.lineProcessedCallback (PyUnicode_AsUTF8 (frame->f_code->co_filename), PyFrame_GetLineNumber (frame), false, error);
console.lineProcessedCallback (PyUnicode_AsUTF8 (PyFrame_GetCode(frame)->co_filename), PyFrame_GetLineNumber (frame), false, error);
} // if (PyTrace_EXCEPTION == what)
else if (PyTrace_RETURN == what) // Fin du bloc de code avec
{
Expand Down
7 changes: 7 additions & 0 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 6.4.2 : 28/08/24
===============

Correctif plantage console lors de "import numpy".
Portage Python 3.11.


Version 6.4.1 : 15/03/24
===============

Expand Down