boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-02-02 21:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Backport new eval() function from HEAD.

Browse Source 
[SVN r37693]
This commit is contained in:
Stefan Seefeld
2007-05-15 13:43:52 +00:00
parent 13432b504f
commit b130c93af6
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/python/exec.hpp
View File

@@ -13,18 +13,25 @@ namespace boost
namespace python
{
// Evaluate python expression from str.
// global and local are the global and local scopes respectively,
// used during evaluation.
object
BOOST_PYTHON_DECL
eval(str string, object global = object(), object local = object());
// Execute python source code from str.
// global and local are the global and local scopes respectively,
// used during execution.
object
BOOST_PYTHON_DECL
BOOST_PYTHON_DECL
exec(str string, object global = object(), object local = object());
// Execute python source code from file filename.
// global and local are the global and local scopes respectively,
// used during execution.
object
BOOST_PYTHON_DECL
BOOST_PYTHON_DECL
exec_file(str filename, object global = object(), object local = object());
}

9
src/exec.cpp
View File

@@ -13,6 +13,15 @@ namespace boost
namespace python
{
object BOOST_PYTHON_DECL eval(str string, object global, object local)
{
// should be 'char const *' but older python versions don't use 'const' yet.
char *s = python::extract<char *>(string);
PyObject* result = PyRun_String(s, Py_eval_input, global.ptr(), local.ptr());
if (!result) throw_error_already_set();
return object(detail::new_reference(result));
}
object BOOST_PYTHON_DECL exec(str string, object global, object local)
{
// should be 'char const *' but older python versions don't use 'const' yet.

10
test/exec.cpp
View File

@@ -49,6 +49,13 @@ BOOST_PYTHON_MODULE(embedded_hello)
}
void eval_test()
{
python::object result = python::eval("'abcdefg'.upper()");
std::string value = python::extract<std::string>(result) BOOST_EXTRACT_WORKAROUND;
BOOST_TEST(value == "ABCDEFG");
}
void exec_test()
{
// Register the module with the interpreter
@@ -108,7 +115,8 @@ int main(int argc, char **argv)
// Initialize the interpreter
Py_Initialize();
if (python::handle_exception(exec_test) ||
if (python::handle_exception(eval_test) ||
python::handle_exception(exec_test) ||
python::handle_exception(boost::bind(exec_file_test, script)))
{
if (PyErr_Occurred())