Changeset 2e4ae1d for python/ext

Timestamp:

Apr 18, 2016, 10:52:00 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

5c1200a

Parents:

4041a6d

Message:

ext/aubiomodule.c: prepare for python 3, see #33

File:

• python/ext/aubiomodule.c (modified) (3 diffs)

python/ext/aubiomodule.c

@@ -249 +249 @@
 };
 
-PyMODINIT_FUNC
-init_aubio (void)
-{
-  PyObject *m;
+#if PY_MAJOR_VERSION >= 3
+// Python3 module definition
+static struct PyModuleDef moduledef = {
+   PyModuleDef_HEAD_INIT,
+   "_aubio",          /* m_name */
+   aubio_module_doc,  /* m_doc */
+   -1,                /* m_size */
+   aubio_methods,     /* m_methods */
+   NULL,              /* m_reload */
+   NULL,              /* m_traverse */
+   NULL,              /* m_clear */
+   NULL,              /* m_free */
+};
+#endif
+
+static PyObject *
+initaubio (void)
+{
+  PyObject *m = NULL;
   int err;
 
@@ -266 +281 @@
       || (generated_types_ready() < 0 )
   ) {
-    return;
-  }
-
+    return m;
+  }
+
+#if PY_MAJOR_VERSION >= 3
+  m = PyModule_Create(&moduledef);
+#else
   m = Py_InitModule3 ("_aubio", aubio_methods, aubio_module_doc);
+#endif
 
   if (m == NULL) {
-    return;
+    return m;
   }
 
@@ -301 +320 @@
   // add ufunc
   add_ufuncs(m);
-}
+
+  return m;
+}
+
+#if PY_MAJOR_VERSION >= 3
+    // Python3 init
+    PyMODINIT_FUNC PyInit__aubio(void)
+    {
+        return initaubio();
+    }
+#else
+    // Python 2 init
+    PyMODINIT_FUNC init_aubio(void)
+    {
+        initaubio();
+    }
+#endif