mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
cc006bf8e0
* rulesets/PythonContext.cpp: Improve error reporting of the python interpreter return status.
46 lines
1.4 KiB
C++
46 lines
1.4 KiB
C++
// Cyphesis Online RPG Server and AI Engine
|
|
// Copyright (C) 2009 Alistair Riddoch
|
|
//
|
|
// This program is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 2 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program; if not, write to the Free Software Foundation,
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
// $Id$
|
|
|
|
#include <Python.h>
|
|
|
|
#include "PythonContext.h"
|
|
|
|
PythonContext::PythonContext()
|
|
{
|
|
m_context = PyDict_New();
|
|
PyDict_SetItemString(m_context, "__builtins__", PyEval_GetBuiltins() );
|
|
}
|
|
|
|
std::string PythonContext::runCommand(const std::string & s)
|
|
{
|
|
PyObject * res = PyRun_String(s.c_str(), Py_single_input, m_context, m_context);
|
|
if (res == 0) {
|
|
if (PyErr_Occurred() == 0) {
|
|
return "WHAT";
|
|
} else {
|
|
PyErr_Print();
|
|
return "ERROR";
|
|
}
|
|
}
|
|
PyObject * repr = PyObject_Repr(res);
|
|
if (repr == 0) {
|
|
return "[undecodable]";
|
|
}
|
|
return PyString_AsString(repr);
|
|
}
|