Skip to content

Backport: fix deprecated warnings #3425

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
andypugh merged 2 commits into from
May 19, 2025
Merged

Backport: fix deprecated warnings #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf838fa
Fix deprecated Py_SetProgramName() and deprecated use of Py_Unbuffere…
BsAtHome Apr 29, 2025
cef130e
Make using PyConfig conditional on python version >= 3.8.
BsAtHome Apr 29, 2025
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
16 changes: 15 additions & 1 deletion src/emc/pythonplugin/python_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,17 @@ PythonPlugin::PythonPlugin(struct _inittab *inittab) :
abs_path(0),
log_level(0)
{
#if PY_VERSION_HEX >= 0x030800f0
PyConfig config;
PyConfig_InitPythonConfig(&config);
#endif
if (abs_path) {
wchar_t *program = Py_DecodeLocale(abs_path, NULL);
#if PY_VERSION_HEX >= 0x030800f0
PyConfig_SetString(&config, &config.program_name, program);
#else
Py_SetProgramName(program);
#endif
}
if (inittab != NULL) {
if (!Py_IsInitialized()) {
Expand Down Expand Up @@ -323,8 +331,14 @@ PythonPlugin::PythonPlugin(struct _inittab *inittab) :
}
}
}
#if PY_VERSION_HEX >= 0x030800f0
config.buffered_stdio = 0;
Py_InitializeFromConfig(&config);
PyConfig_Clear(&config);
#else
Py_UnbufferedStdioFlag = 1;
Py_Initialize();
#endif
initialize();
}

Expand Down Expand Up @@ -392,7 +406,7 @@ int PythonPlugin::configure(const char *iniFilename,
log_level = atoi(inistring);
else log_level = 0;

char pycmd[PATH_MAX];
char pycmd[PATH_MAX + 64];
int n = 1;
int lineno;
while (NULL != (inistring = inifile.Find("PATH_PREPEND", "PYTHON",
Expand Down
8 changes: 8 additions & 0 deletions src/hal/components/panelui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,16 @@ int main(int argc, char **argv)
PyObject *pModule, *pFunc, *pPeriodicFunc, *pClass;
char name[] = "panelui";
wchar_t *wname = Py_DecodeLocale(name, NULL);
#if PY_VERSION_HEX >= 0x030800f0
PyConfig config;
PyConfig_InitPythonConfig(&config);
PyConfig_SetString(&config, &config.program_name, wname);
Py_InitializeFromConfig(&config);
PyConfig_Clear(&config);
#else
Py_SetProgramName(wname);
Py_Initialize();
#endif
PyRun_SimpleString("import pyui\n"
"pyui.instance = pyui.master.keyboard()\n"
"pyui.exit_funct = pyui.instance.exit\n"
Expand Down