boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-27 19:12:16 +00:00
Code Issues Projects Releases Wiki Activity

several fix for the exec test case to make it runs under py3k

Browse Source 
[SVN r54644]
This commit is contained in:
Haoyu Bai
2009-07-04 16:00:06 +00:00
parent 1370f36d45
commit 7beda2e192
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/exec.cpp
View File

@@ -59,7 +59,13 @@ void eval_test()
void exec_test()
{
// Register the module with the interpreter
if (PyImport_AppendInittab(const_cast<char*>("embedded_hello"), initembedded_hello) == -1)
if (PyImport_AppendInittab(const_cast<char*>("embedded_hello"),
#if PY_VERSION_HEX >= 0x03000000
PyInit_embedded_hello
#else
initembedded_hello
#endif
) == -1)
throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
"builtin modules");
// Retrieve the main module
@@ -105,7 +111,7 @@ void exec_test_error()
{
// Execute a statement that raises a python exception.
python::dict global;
python::object result = python::exec("print unknown \n", global, global);
python::object result = python::exec("print(unknown) \n", global, global);
}
int main(int argc, char **argv)
@@ -115,9 +121,10 @@ int main(int argc, char **argv)
// Initialize the interpreter
Py_Initialize();
if (python::handle_exception(eval_test) ||
python::handle_exception(exec_test) ||
python::handle_exception(boost::bind(exec_file_test, script)))
if (python::handle_exception(eval_test)
|| python::handle_exception(exec_test)
|| python::handle_exception(boost::bind(exec_file_test, script))
)
{
if (PyErr_Occurred())
{
@@ -149,7 +156,7 @@ int main(int argc, char **argv)
}
// Boost.Python doesn't support Py_Finalize yet.
// Py_Finalize();
//Py_Finalize();
return boost::report_errors();
}