wpaspy: Allow building with python3

Add the necessary modified module registration code to allow building
wpaspy with python3. Also clean up the wpaspy_close() function to not
poke into the python version specific details.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/wpaspy/Makefile b/wpaspy/Makefile
index bc920e0cc5036b24145aef4286ce07a0f2ec4217..6f720a9fe1218cfd566930ec6d5a4a99b4412bfe 100644 (file)
--- a/wpaspy/Makefile
+++ b/wpaspy/Makefile
@@ -2,6 +2,7 @@ all: build
 
 SRC=wpaspy.c
 
+.PHONY: build
 build: $(SRC) setup.py
        python setup.py build
 

diff --git a/wpaspy/wpaspy.c b/wpaspy/wpaspy.c
index 278089b48adaf24559759f981fdce84ac9ec39c4..4d4c2a49569f75b38fa7eddf176bf1c6c3c4d581 100644 (file)
--- a/wpaspy/wpaspy.c
+++ b/wpaspy/wpaspy.c
@@ -44,8 +44,7 @@ static void wpaspy_close(struct wpaspy_obj *self)
                self->ctrl = NULL;
        }
 
-       if (self->ob_type)
-               self->ob_type->tp_free((PyObject *) self);
+       PyObject_Del(self);
 }
 
 
@@ -193,6 +192,7 @@ static PyTypeObject wpaspy_ctrl = {
 };
 
 
+#if PY_MAJOR_VERSION < 3
 static PyMethodDef module_methods[] = {
        { NULL, NULL, 0, NULL }
 };
@@ -212,3 +212,34 @@ PyMODINIT_FUNC initwpaspy(void)
        PyModule_AddObject(mod, "Ctrl", (PyObject *) &wpaspy_ctrl);
        PyModule_AddObject(mod, "error", wpaspy_error);
 }
+#else
+static struct PyModuleDef wpaspy_def = {
+       PyModuleDef_HEAD_INIT,
+       "wpaspy",
+};
+
+
+PyMODINIT_FUNC initwpaspy(void)
+{
+       PyObject *mod;
+
+       mod = PyModule_Create(&wpaspy_def);
+       if (!mod)
+               return NULL;
+
+       wpaspy_error = PyErr_NewException("wpaspy.error", NULL, NULL);
+
+       Py_INCREF(&wpaspy_ctrl);
+       Py_INCREF(wpaspy_error);
+
+       if (PyModule_AddObject(mod, "Ctrl", (PyObject *) &wpaspy_ctrl) < 0 ||
+           PyModule_AddObject(mod, "error", wpaspy_error) < 0) {
+               Py_DECREF(&wpaspy_ctrl);
+               Py_DECREF(wpaspy_error);
+               Py_DECREF(mod);
+               mod = NULL;
+       }
+
+       return mod;
+}
+#endif