Changeset 225 for pymigemo/trunk

Timestamp:

11/10/12 01:41:55 (12 years ago)

Author:

atzm

Message:

• Python3 support

File:

• pymigemo/trunk/pymigemo.c (modified) (17 diffs)

pymigemo/trunk/pymigemo.c

@@ -1 +1 @@
 /*
  * pymigemo.c - C/Migemo Python binding
- * Copyright(C) 2005-2010, Atzm WATANABE <atzm@atzm.org>
+ * Copyright(C) 2005-2012, Atzm WATANABE <atzm@atzm.org>
  *
  * $Id$
@@ -18 +18 @@
 #include <unistd.h>
 
-#define PYMIGEMO_VERSION "0.3"
+#define PYMIGEMO_VERSION "0.4"
+
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 1) || PY_MAJOR_VERSION > 3
+#  define PYTHON3
+#endif
+
+#ifndef Py_TYPE
+#  define Py_TYPE(ob) (((PyObject *)(ob))->ob_type)
+#endif
 
 /* for dereference migemo object members */
@@ -100 +108 @@
     }
 
-    self->ob_type->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
@@ -165 +173 @@
     }
 
-    return PyString_FromString(encoding);
+    return PyBytes_FromString(encoding);
 }
 
@@ -193 +201 @@
         }
 
-        query = strdup(PyString_AS_STRING(q));
+        query = strdup(PyBytes_AS_STRING(q));
         Py_DECREF(q);
 
@@ -200 +208 @@
         }
     }
-    else if (PyString_Check(pyquery)) {
-        query = strdup(PyString_AS_STRING(pyquery));
+    else if (PyBytes_Check(pyquery)) {
+        query = strdup(PyBytes_AS_STRING(pyquery));
 
         if (query == NULL) {
@@ -219 +227 @@
     }
 
-    pyrestr = PyString_FromString(regex);
+    pyrestr = PyBytes_FromString(regex);
     migemo_release(self->migemo_obj, regex);
     if (pyrestr == NULL) {
@@ -264 +272 @@
 
     if (op = migemo_get_operator(self->migemo_obj, index)) {
-        result = PyString_FromString(op);
+        result = PyBytes_FromString(op);
     }
     else {
@@ -294 +302 @@
         }
 
-        result = PyInt_FromLong((long)migemo_load(self->migemo_obj, dict_id, dict_file));
+        result = PyLong_FromLong((long)migemo_load(self->migemo_obj, dict_id, dict_file));
     }
 
@@ -307 +315 @@
 
 static PyMethodDef Migemo_methods[] = {
-    {"query", (PyCFunction)Migemo_query, METH_KEYWORDS,
+    {"query", (PyCFunction)Migemo_query, METH_VARARGS | METH_KEYWORDS,
      "return regex from romaji string\n\
 \n\
@@ -314 +322 @@
 \n\
   returns: regex string as Unicode object"},
-    {"set_operator", (PyCFunction)Migemo_set_operator, METH_KEYWORDS,
+    {"set_operator", (PyCFunction)Migemo_set_operator, METH_VARARGS | METH_KEYWORDS,
      "set operator string as the meta character of regex\n\
 \n\
@@ -323 +331 @@
 \n\
   returns: boolean value"},
-    {"get_operator", (PyCFunction)Migemo_get_operator, METH_KEYWORDS,
+    {"get_operator", (PyCFunction)Migemo_get_operator, METH_VARARGS | METH_KEYWORDS,
      "get operator string as the meta character of regex\n\
 \n\
@@ -331 +339 @@
 \n\
   returns: operator string (str)"},
-    {"load", (PyCFunction)Migemo_load, METH_KEYWORDS,
+    {"load", (PyCFunction)Migemo_load, METH_VARARGS | METH_KEYWORDS,
      "add dictionary to Migemo object\n\
 \n\
@@ -357 +365 @@
 };
 
+#ifndef PyVarObject_HEAD_INIT
+#  define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+
 static PyTypeObject MigemoType = {
-    PyObject_HEAD_INIT(NULL)
-    0,                          /*ob_size*/
+    PyVarObject_HEAD_INIT(NULL, 0)
     "migemo.Migemo",            /*tp_name*/
     sizeof(Migemo),             /*tp_basicsize*/
@@ -399 +410 @@
 };
 
+#define PYMIGEMO_MODULEDOC "C/Migemo Python binding"
+
 static PyMethodDef module_methods[] = {
     {NULL} /* Sentinel */
 };
 
-#ifndef PyMODINIT_FUNC
-#define PyMODINIT_FUNC void
-#endif
-PyMODINIT_FUNC
-initmigemo(void) 
+#ifdef PYTHON3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "migemo",            /* m_name */
+    PYMIGEMO_MODULEDOC,  /* m_doc */
+    -1,                  /* m_size */
+    module_methods,      /* m_methods */
+    NULL,                /* m_reload */
+    NULL,                /* m_traverse */
+    NULL,                /* m_clear */
+    NULL,                /* m_free */
+};
+#endif
+
+#ifdef PYTHON3
+#  define MOD_INIT(name) PyObject *PyInit_##name(void)
+#else
+#  define MOD_INIT(name) void init##name(void)
+#endif
+
+MOD_INIT(migemo)
 {
     PyObject* m;
@@ -414 +443 @@
         return;
 
-    m = Py_InitModule3("migemo", module_methods, "C/Migemo Python binding");
+#ifdef PYTHON3
+    m = PyModule_Create(&moduledef);
+#else
+    m = Py_InitModule3("migemo", module_methods, PYMIGEMO_MODULEDOC);
+#endif
+
+    if (m == NULL) {
+#ifdef PYTHON3
+        return NULL;
+#else
+        return;
+#endif
+    }
 
     Py_INCREF(&MigemoType);
@@ -435 +476 @@
     PyModule_AddObject(m, "OPINDEX_SELECT_OUT", Py_BuildValue("i", MIGEMO_OPINDEX_SELECT_OUT));
     PyModule_AddObject(m, "OPINDEX_NEWLINE", Py_BuildValue("i", MIGEMO_OPINDEX_NEWLINE));
-}
+
+#ifdef PYTHON3
+    return m;
+#endif
+}