upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #906: warning: ‘Py_SetProgramName’ is deprecated.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2023-07-03 10:23:37 +02:00
parent 380e3de140
commit 48a6ff14a4
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
3 July 2023: Wouter
- Fix #906: warning: ‘Py_SetProgramName’ is deprecated.
29 June 2023: George 29 June 2023: George
- More fixes for reference counting for python module and clean up - More fixes for reference counting for python module and clean up
failure code. failure code.

40
pythonmod/pythonmod.c
View file

@ -303,18 +303,58 @@ int pythonmod_init(struct module_env* env, int id)
/* Initialize Python libraries */ /* Initialize Python libraries */
if (py_mod_count==1 && !Py_IsInitialized()) if (py_mod_count==1 && !Py_IsInitialized())
{ {
#if PY_VERSION_HEX >= 0x03080000
PyStatus status;
PyPreConfig preconfig;
PyConfig config;
#endif
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
wchar_t progname[8]; wchar_t progname[8];
mbstowcs(progname, "unbound", 8); mbstowcs(progname, "unbound", 8);
#else #else
char *progname = "unbound"; char *progname = "unbound";
#endif #endif
#if PY_VERSION_HEX < 0x03080000
Py_SetProgramName(progname); Py_SetProgramName(progname);
#else
/* Python must be preinitialized, before the PyImport_AppendInittab
* call. */
PyPreConfig_InitPythonConfig(&preconfig);
status = Py_PreInitialize(&preconfig);
if(PyStatus_Exception(status)) {
log_err("python exception in Py_PreInitialize: %s%s%s",
(status.func?status.func:""), (status.func?": ":""),
(status.err_msg?status.err_msg:""));
return 0;
}
#endif
Py_NoSiteFlag = 1; Py_NoSiteFlag = 1;
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
PyImport_AppendInittab(SWIG_name, (void*)SWIG_init); PyImport_AppendInittab(SWIG_name, (void*)SWIG_init);
#endif #endif
#if PY_VERSION_HEX < 0x03080000
Py_Initialize(); Py_Initialize();
#else
PyConfig_InitPythonConfig(&config);
status = PyConfig_SetString(&config, &config.program_name, progname);
if(PyStatus_Exception(status)) {
log_err("python exception in PyConfig_SetString(.. program_name ..): %s%s%s",
(status.func?status.func:""), (status.func?": ":""),
(status.err_msg?status.err_msg:""));
PyConfig_Clear(&config);
return 0;
}
config.site_import = 0;
status = Py_InitializeFromConfig(&config);
if(PyStatus_Exception(status)) {
log_err("python exception in Py_InitializeFromConfig: %s%s%s",
(status.func?status.func:""), (status.func?": ":""),
(status.err_msg?status.err_msg:""));
PyConfig_Clear(&config);
return 0;
}
PyConfig_Clear(&config);
#endif
#if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 6) #if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 6)
/* initthreads only for python 3.6 and older */ /* initthreads only for python 3.6 and older */
PyEval_InitThreads(); PyEval_InitThreads();