diff options
| -rw-r--r-- | xbmc/interfaces/python/XBPyThread.cpp | 16 | ||||
| -rw-r--r-- | xbmc/interfaces/python/XBPython.cpp | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/xbmc/interfaces/python/XBPyThread.cpp b/xbmc/interfaces/python/XBPyThread.cpp index e4e97cb828..6c152c8929 100644 --- a/xbmc/interfaces/python/XBPyThread.cpp +++ b/xbmc/interfaces/python/XBPyThread.cpp @@ -224,7 +224,7 @@ void XBPyThread::Process() { // run script from file // We need to have python open the file because on Windows the DLL that python - // is linked against may not be the DLL that xbmc is linked against so + // is linked against may not be the DLL that xbmc is linked against so // passing a FILE* to python from an fopen has the potential to crash. PyObject* file = PyFile_FromString((char *) _P(m_source).c_str(), (char*)"r"); FILE *fp = PyFile_AsFile(file); @@ -234,19 +234,7 @@ void XBPyThread::Process() PyObject *f = PyString_FromString(_P(m_source).c_str()); PyDict_SetItemString(moduleDict, "__file__", f); Py_DECREF(f); - PyRun_File(fp, _P(m_source).c_str(), m_Py_file_input, moduleDict, moduleDict); - - // Get a reference to the main module - // and global dictionary - PyObject* main_module = PyImport_AddModule((char*)"__main__"); - PyObject* global_dict = PyModule_GetDict(main_module); - - // Extract a reference to the function "func_name" - // from the global dictionary - PyObject* expression = PyDict_GetItemString(global_dict, "xbmcclosefilehack"); - - if (!PyObject_CallFunction(expression,(char*)"(O)",file)) - CLog::Log(LOGERROR,"Failed to close the script file %s",_P(m_source).c_str()); + PyRun_FileExFlags(fp, _P(m_source).c_str(), m_Py_file_input, moduleDict, moduleDict,1,NULL); } else CLog::Log(LOGERROR, "%s not found!", m_source); diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp index 4b54ffb42f..ee34fbcead 100644 --- a/xbmc/interfaces/python/XBPython.cpp +++ b/xbmc/interfaces/python/XBPython.cpp @@ -250,10 +250,6 @@ void XBPython::InitializeInterpreter() "import sys\n" "sys.stdout = xbmcout()\n" "sys.stderr = xbmcout()\n" - "def xbmcclosefilehack(f):\n" -// "\txbmc.output(\"Closing Script File.\")\n" - "\tf.close()\n" - "\n" "print '-->Python Interpreter Initialized<--'\n" "") == -1) { |