Changed PyRun_SimpleFile and PyRun_SimpleString to PyRun_SimpleFileExFlags and PyRun_SimpleStringFlags from shared library

Author: moroen

hardware/plugins/DelayedLink.h

@@ -99,8 +99,8 @@ namespace Plugins {
 		DECLARE_PYTHON_SYMBOL(PyObject*, PyBool_FromLong, long);
 
 #ifdef ENABLE_PYTHON
-        DECLARE_PYTHON_SYMBOL(int, PyRun_SimpleString, const char*);
-        DECLARE_PYTHON_SYMBOL(int, PyRun_SimpleFile, FILE* COMMA const char*);
+        DECLARE_PYTHON_SYMBOL(int, PyRun_SimpleStringFlags, const char* COMMA PyCompilerFlags*);
+        DECLARE_PYTHON_SYMBOL(int, PyRun_SimpleFileExFlags, FILE* COMMA const char* COMMA int COMMA PyCompilerFlags*);
 #endif
 
 #ifdef _DEBUG
@@ -193,8 +193,8 @@ namespace Plugins {
 #endif
 
 #ifdef ENABLE_PYTHON
-                    RESOLVE_PYTHON_SYMBOL(PyRun_SimpleFile);
-                    RESOLVE_PYTHON_SYMBOL(PyRun_SimpleString);
+                    RESOLVE_PYTHON_SYMBOL(PyRun_SimpleFileExFlags);
+                    RESOLVE_PYTHON_SYMBOL(PyRun_SimpleStringFlags);
 #endif
 					RESOLVE_PYTHON_SYMBOL(PyBool_FromLong);
 				}
@@ -351,8 +351,8 @@ extern	SharedLibraryProxy* pythonLib;
 #define _Py_NoneStruct			pythonLib->_Py_NoneStruct
 
 #ifdef ENABLE_PYTHON
-// #define PyRun_SimpleString      pythonLib->PyRun_SimpleString
-// #define PyRun_SimpleFile        pythonLib->PyRun_SimpleFile
+#define PyRun_SimpleStringFlags      pythonLib->PyRun_SimpleStringFlags
+#define PyRun_SimpleFileExFlags pythonLib->PyRun_SimpleFileExFlags
 #endif
 
 #define PyBool_FromLong			pythonLib->PyBool_FromLong

main/EventSystem.cpp

@@ -2351,11 +2351,11 @@ void CEventSystem::EvaluatePython(const std::string &reason, const std::string &
                isNightime = true;
            }
 
-           if (Plugins::PyDict_SetItemString(pModuleDict, "is_daytime", PyBool_FromLong(isDaytime)) == -1) {
+           if (Plugins::PyDict_SetItemString(pModuleDict, "is_daytime", Plugins::PyBool_FromLong(isDaytime)) == -1) {
                _log.Log(LOG_ERROR, "Python EventSystem: Failed to add 'is_daytime' to module_dict");
            }
 
-           if (Plugins::PyDict_SetItemString(pModuleDict, "is_nighttime", PyBool_FromLong(isNightime)) == -1) {
+           if (Plugins::PyDict_SetItemString(pModuleDict, "is_nighttime", Plugins::PyBool_FromLong(isNightime)) == -1) {
                _log.Log(LOG_ERROR, "Python EventSystem: Failed to add 'is_daytime' to module_dict");
            }
 
@@ -2383,7 +2383,7 @@ void CEventSystem::EvaluatePython(const std::string &reason, const std::string &
            FILE* PythonScriptFile = _Py_fopen(filename.c_str(),"r+");
 
             // FILE* PythonScriptFile = fopen(filename.c_str(), "r");
-            PyRun_SimpleFile(PythonScriptFile, filename.c_str());
+            Plugins::PyRun_SimpleFileExFlags(PythonScriptFile, filename.c_str(), 0, NULL);
 
         	if (PythonScriptFile!=NULL)
         		fclose(PythonScriptFile);

main/EventsPythonModule.cpp

@@ -94,7 +94,7 @@
 
             _log.Log(LOG_STATUS, "Python EventSystem: Initalizing event module.");
 
-            PyObject* pModule = PyModule_Create2(&DomoticzEventsModuleDef, PYTHON_API_VERSION);            
+            PyObject* pModule = PyModule_Create2(&DomoticzEventsModuleDef, PYTHON_API_VERSION);
             return pModule;
         }
 
@@ -106,7 +106,7 @@
                 return pModule;
             } else {
                 _log.Log(LOG_STATUS, "Python EventSystem: Module not found - Trying to initialize.");
-                PyRun_SimpleString("import DomoticzEvents");
+                Plugins::PyRun_SimpleStringFlags("import DomoticzEvents", NULL);
                 pModule = PyState_FindModule(&DomoticzEventsModuleDef);
 
                 if (pModule) {