Python 3 compatibility. (#121)

* Make common module Python 3 compatible.

* Make plasma module Python 3 compatible.

* Make photon module Python 3 compatible.

* Make numbuf module Python 3 compatible.

* Remaining changes for Python 3 compatibility.

* Test Python 3 in Travis.

* Fixes.

src/photon/CMakeLists.txt

@@ -19,8 +19,9 @@ message(STATUS "PYTHON_INCLUDE_DIRS: " ${PYTHON_INCLUDE_DIRS})
 execute_process(COMMAND ${CUSTOM_PYTHON_EXECUTABLE} -c "import sys; print(sys.exec_prefix)"
                 OUTPUT_VARIABLE PYTHON_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
 message(STATUS "PYTHON_PREFIX: " ${PYTHON_PREFIX})
+# The name ending in "m" is for miniconda.
 FIND_LIBRARY(PYTHON_LIBRARIES
-             NAMES ${PYTHON_LIBRARY_NAME}
+             NAMES "${PYTHON_LIBRARY_NAME}" "${PYTHON_LIBRARY_NAME}m"
              HINTS "${PYTHON_PREFIX}"
              PATH_SUFFIXES "lib" "libs"
              NO_DEFAULT_PATH)
@@ -29,8 +30,9 @@ message(STATUS "PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
 # the Python include directories.
 if(NOT PYTHON_LIBRARIES)
   message(STATUS "Failed to find PYTHON_LIBRARIES near the Python executable, so now looking near the Python include directories.")
+  # The name ending in "m" is for miniconda.
   FIND_LIBRARY(PYTHON_LIBRARIES
-               NAMES ${PYTHON_LIBRARY_NAME}
+               NAMES "${PYTHON_LIBRARY_NAME}" "${PYTHON_LIBRARY_NAME}m"
                HINTS "${PYTHON_INCLUDE_DIRS}/../.."
                PATH_SUFFIXES "lib" "libs"
                NO_DEFAULT_PATH)

src/photon/photon/__init__.py

@@ -2,5 +2,5 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from libphoton import *
-from photon_services import *
+from .libphoton import *
+from .photon_services import *

src/photon/photon_extension.c

@@ -73,7 +73,7 @@ static PyMethodDef PyPhotonClient_methods[] = {
 };
 
 static PyTypeObject PyPhotonClientType = {
-    PyObject_HEAD_INIT(NULL) 0,          /* ob_size */
+    PyVarObject_HEAD_INIT(NULL, 0)       /* ob_size */
     "photon.PhotonClient",               /* tp_name */
     sizeof(PyPhotonClient),              /* tp_basicsize */
     0,                                   /* tp_itemsize */
@@ -121,24 +121,55 @@ static PyMethodDef photon_methods[] = {
     {NULL} /* Sentinel */
 };
 
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "libphoton",                         /* m_name */
+    "A module for the local scheduler.", /* m_doc */
+    0,                                   /* m_size */
+    photon_methods,                      /* m_methods */
+    NULL,                                /* m_reload */
+    NULL,                                /* m_traverse */
+    NULL,                                /* m_clear */
+    NULL,                                /* m_free */
+};
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+#define INITERROR return NULL
+#else
+#define INITERROR return
+#endif
+
 #ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
 #define PyMODINIT_FUNC void
 #endif
 
-PyMODINIT_FUNC initlibphoton(void) {
-  PyObject *m;
+#if PY_MAJOR_VERSION >= 3
+#define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+#else
+#define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
+#endif
 
-  if (PyType_Ready(&PyTaskType) < 0)
-    return;
+MOD_INIT(libphoton) {
+  if (PyType_Ready(&PyTaskType) < 0) {
+    INITERROR;
+  }
 
-  if (PyType_Ready(&PyObjectIDType) < 0)
-    return;
+  if (PyType_Ready(&PyObjectIDType) < 0) {
+    INITERROR;
+  }
 
-  if (PyType_Ready(&PyPhotonClientType) < 0)
-    return;
+  if (PyType_Ready(&PyPhotonClientType) < 0) {
+    INITERROR;
+  }
 
-  m = Py_InitModule3("libphoton", photon_methods,
-                     "A module for the local scheduler.");
+#if PY_MAJOR_VERSION >= 3
+  PyObject *m = PyModule_Create(&moduledef);
+#else
+  PyObject *m = Py_InitModule3("libphoton", photon_methods,
+                               "A module for the local scheduler.");
+#endif
 
   init_pickle_module();
 
@@ -155,4 +186,8 @@ PyMODINIT_FUNC initlibphoton(void) {
   PhotonError = PyErr_NewException(photon_error, NULL, NULL);
   Py_INCREF(PhotonError);
   PyModule_AddObject(m, "photon_error", PhotonError);
+
+#if PY_MAJOR_VERSION >= 3
+  return m;
+#endif
 }

src/photon/test/test.py

@@ -74,7 +74,7 @@ class TestPhotonClient(unittest.TestCase):
       10 * ["a"],
       100 * ["a"],
       1000 * ["a"],
-      [1, 1.3, 2L, 1L << 100, "hi", u"hi", [1, 2]],
+      [1, 1.3, 1 << 100, "hi", u"hi", [1, 2]],
       object_ids[:1],
       object_ids[:2],
       object_ids[:3],