From 7beda2e192df728100d6a61c0dd5c6e1537b9b25 Mon Sep 17 00:00:00 2001
From: Haoyu Bai <divinekid@gmail.com>
Date: Sat, 4 Jul 2009 16:00:06 +0000
Subject: [PATCH] several fix for the exec test case to make it runs under py3k

[SVN r54644]
---
 test/exec.cpp | 19 +++++++++++++------
 test/exec.py  |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/test/exec.cpp b/test/exec.cpp
index 31883d89..112c6d8c 100644
--- a/test/exec.cpp
+++ b/test/exec.cpp
@@ -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();
 }
 
diff --git a/test/exec.py b/test/exec.py
index 5a8faf79..c8628bf8 100644
--- a/test/exec.py
+++ b/test/exec.py
@@ -2,5 +2,5 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-print 'Hello World !'
-number = 42
+if True:
+    number = 42