WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-08-17 21:25:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix python module install path detection.

Browse Source
This commit is contained in:
W.C.A. Wijngaards
2023-01-09 15:03:38 +01:00
parent c5c4f6d40b
commit 4517dcd439
4 changed files with 117 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pythonmod/pythonmod.c
+22
View File
@@ -330,6 +330,27 @@ int pythonmod_init(struct module_env* env, int id)
}
/* Check if sysconfig is there and use that instead of distutils;
* distutils.sysconfig is deprecated in Python 3.10. */
#if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 9)
/* For older versions, first try distutils.sysconfig because the
* sysconfig paths may contain wrong values, eg. on Debian10 for
* python 2.7 and 3.7. */
if(PyRun_SimpleString("import distutils.sysconfig \n") < 0) {
log_info("pythonmod: module distutils.sysconfig not available; "
"falling back to sysconfig.");
if(PyRun_SimpleString("import sysconfig \n") < 0
|| PyRun_SimpleString("sys.path.append("
"sysconfig.get_path('platlib')) \n") < 0) {
goto python_init_fail;
}
} else {
if(PyRun_SimpleString("sys.path.append("
"distutils.sysconfig.get_python_lib(1,0)) \n") < 0) {
goto python_init_fail;
}
}
#else
/* Python 3.10 and higher, check sysconfig first,
* distutils is deprecated. */
if(PyRun_SimpleString("import sysconfig \n") < 0) {
log_info("pythonmod: module sysconfig not available; "
"falling back to distutils.sysconfig.");
@@ -344,6 +365,7 @@ int pythonmod_init(struct module_env* env, int id)
goto python_init_fail;
}
}
#endif
if(PyRun_SimpleString("from unboundmodule import *\n") < 0)
{
goto python_init_fail;