summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-06-01 16:20:48 +0100
committerCaolán McNamara <caolan.mcnamara@collabora.com>2023-06-02 16:06:26 +0200
commit5c79145a53eba0ebeb7ba616eda89fb175ae8de0 (patch)
tree3b5802f2e3f00ef72b3dcb804c0e31c428336341
parenta0a20a7e2ba19c1b6eedd9aaa5a41e7a6e93c95b (diff)
WaE: Py_SetPythonHome is deprecated since python 3.11
not obvious how to replace it, so just accept for now Change-Id: Id3fc4c95a5cc60e078f06faaa024faa9c770de20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152504 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit c7b4d15c5c33e8ac05b054aa1d19751fb1b1275a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152449 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index da0467f450c6..b5261e49033d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -130,7 +130,9 @@ static void setPythonHome ( const OUString & pythonHome )
PyErr_SetString(PyExc_SystemError, "python home path is too long");
return;
}
- Py_SetPythonHome(wide);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ Py_SetPythonHome(wide); // deprecated since python 3.11
+SAL_WNODEPRECATED_DECLARATIONS_POP
}
static void prependPythonPath( std::u16string_view pythonPathBootstrap )