Bug#595786: libboost-python-dev: Boost Python should also be compiled against Python3

[Andreas Kloeckner]

On Sun, 12 Sep 2010 11:36:03 -0500, "Steve M. Robbins" <st...@sumost.ca> wrote:
> On Mon, Sep 06, 2010 at 12:22:07PM -0400, Andreas Kloeckner wrote:
> 
> > I very much appreciate that you already compile Boost Python against
> > Python 2.5 and 2.6. Since upstream already also supports Python3, it
> > would be nice to also compile against whatever the currently supported
> > version of Python3 is (3.1 as of this writing).
> 
> I agree.  Unfortunately, when I tried building Boost 1.44 (just
> uploaded to experimental), it failed to build Boost.MPI.  I posted the
> build failure to the Boost list [1] but no response yet.

Thanks for your help!

I've attached a patch for the build failure. It compiles, but is
otherwise untested. Would you mind forwarding this to the boost guys for
review?

Thanks,
Andreas

pgp1JYXl4ez42.pgp
Description: PGP signature

diff -urN -x '*~' boost_1_44_0/libs/mpi/src/python/datatypes.cpp boost_1_44_0-hacked/libs/mpi/src/python/datatypes.cpp
--- boost_1_44_0/libs/mpi/src/python/datatypes.cpp	2007-11-25 13:38:02.000000000 -0500
+++ boost_1_44_0-hacked/libs/mpi/src/python/datatypes.cpp	2010-09-14 01:31:40.105159565 -0400
@@ -17,7 +17,9 @@
 
 void export_datatypes()
 {
+#if PY_MAJOR_VERSION < 3
   register_serialized(long(0), &PyInt_Type);
+#endif
   register_serialized(false, &PyBool_Type);
   register_serialized(double(0.0), &PyFloat_Type);
 }
diff -urN -x '*~' boost_1_44_0/libs/mpi/src/python/py_environment.cpp boost_1_44_0-hacked/libs/mpi/src/python/py_environment.cpp
--- boost_1_44_0/libs/mpi/src/python/py_environment.cpp	2007-11-25 13:38:02.000000000 -0500
+++ boost_1_44_0-hacked/libs/mpi/src/python/py_environment.cpp	2010-09-14 01:20:06.941242577 -0400
@@ -11,6 +11,9 @@
  *  This file reflects the Boost.MPI "environment" class into Python
  *  methods at module level.
  */
+
+#include <locale>
+#include <string>
 #include <boost/python.hpp>
 #include <boost/mpi.hpp>
 
@@ -50,11 +53,65 @@
 
   // If anything changed, convert C-style argc/argv into Python argv
   if (mpi_argv != my_argv)
+  {
+#if PY_MAJOR_VERSION >= 3
+    // Code stolen from py3k/Modules/python.c.
+
+    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+    /* We need a second copies, as Python might modify the first one. */
+    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+
+    if (!argv_copy || !argv_copy2) {
+      fprintf(stderr, "out of memory\n");
+      return false;
+    }
+
+    std::locale mylocale;
+    mbstate_t mystate;
+
+    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
+      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
+
+    for (int i = 0; i < mpi_argc; i++) 
+    {
+      size_t length = strlen(mpi_argv[i]);
+
+      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
+
+      const char *from_next;
+      wchar_t *to_next;
+
+      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
+        myfacet.out(mystate,
+            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
+            dest, dest+length+1, to_next);
+
+      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
+      {
+        fprintf(stderr, "failure translating argv\n");
+        return 1;
+      }
+
+      argv_copy2[i] = argv_copy[i] = dest;
+      if (!argv_copy[i])
+          return false;
+    }
+
+    PySys_SetArgv(mpi_argc, argv_copy);
+
+    for (int i = 0; i < mpi_argc; i++) {
+        PyMem_Free(argv_copy2[i]);
+    }
+    PyMem_Free(argv_copy);
+    PyMem_Free(argv_copy2);
+#else
     PySys_SetArgv(mpi_argc, mpi_argv);
+#endif
+  }
 
-  for (int arg = 0; arg < my_argc; ++arg)
-    free(my_argv[arg]);
-  delete [] my_argv;
+  for (int arg = 0; arg < mpi_argc; ++arg)
+    free(mpi_argv[arg]);
+  delete [] mpi_argv;
 
   return true;
 }