[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - pyuno/source

David Ostrovsky (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 5 21:12:55 UTC 2021


 pyuno/source/loader/pyuno_loader.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c82bb0297ea0dbba77823230ed36b81a39e8cbab
Author:     David Ostrovsky <david at ostrovsky.org>
AuthorDate: Mon Dec 21 07:56:11 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 5 22:12:21 2021 +0100

    tdf#138987 pyuno: PyEval_InitThreads is a no-op in Python 3.9
    
    Change-Id: I220eecfa6aaf4d5cb12e3b4eacadf25843b41452
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108403
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit 8be493744cafc2572c701e681ab147fa28c6bc39)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108719
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 07dc748235f9..dc428fb1f3a2 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -229,7 +229,9 @@ PythonInit() {
 
     // initialize python
     Py_Initialize();
+#if PY_VERSION_HEX < 0x03090000
     PyEval_InitThreads();
+#endif
 
     PyThreadState *tstate = PyThreadState_Get();
     PyEval_ReleaseThread( tstate );


More information about the Libreoffice-commits mailing list