Merge pull request #3425 from BsAtHome/backport_2.9_fix-deprecated

Backport: fix deprecated warnings

Author: andypugh

src/emc/pythonplugin/python_plugin.cc

@@ -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()) {
@@ -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();
 }
 
@@ -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",

src/hal/components/panelui.c

@@ -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"