From 23502721870be84917fb97e4c9b8ae0755bd220e Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Thu, 2 Nov 2017 03:17:07 +0000 Subject: Revert r317182 for https://reviews.llvm.org/D39128 we're still failing on android. I'll ask Larry to ask Pavel for any tips he might be able to give. llvm-svn: 317183 --- .../Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 246da4f07b8..6c39690268c 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -504,7 +504,7 @@ void ScriptInterpreterPython::LeaveSession() { } bool ScriptInterpreterPython::SetStdHandle(File &file, const char *py_name, - PythonObject &save_file, + PythonFile &save_file, const char *mode) { if (file.IsValid()) { // Flush the file before giving it to python to avoid interleaved output. @@ -512,7 +512,8 @@ bool ScriptInterpreterPython::SetStdHandle(File &file, const char *py_name, PythonDictionary &sys_module_dict = GetSysModuleDictionary(); - save_file = sys_module_dict.GetItemForKey(PythonString(py_name)); + save_file = sys_module_dict.GetItemForKey(PythonString(py_name)) + .AsType(); PythonFile new_file(file, mode); sys_module_dict.SetItemForKey(PythonString(py_name), new_file); -- cgit v1.2.3