Changeset 27713 for lang

Timestamp:

01/01/09 05:14:32 (4 years ago)

Author:

tasuku

Message:

* version 0.7
* Added Python 2.4 compatibility. Thanks to Vernon Tang.
* Allow negitive values on optimize and tune methods of pytc.BDB and pytc.HDB. Thanks to Vernon Tang.
* removed unnecessarily links(libz and libm). Thanks to Vernon Tang.

Location:

lang/python/pytc/trunk

Files:

• ChangeLog (modified) (1 diff)
• pytc.c (modified) (5 diffs)
• setup.py (modified) (2 diffs)

lang/python/pytc/trunk/ChangeLog

@@ +1 @@
+2008-12-31  Tasuku SUENAGA <gunyarakun@sourceforge.net>
+
+        * version 0.7
+        * Added Python 2.4 compatibility. Thanks to Vernon Tang.
+        * Allow negitive values on optimize and tune methods of pytc.BDB and pytc.HDB. Thanks to Vernon Tang.
+        * removed unnecessarily links(libz and libm). Thanks to Vernon Tang.
+
 2008-11-22  Tasuku SUENAGA <gunyarakun@sourceforge.net>
 

lang/python/pytc/trunk/pytc.c

@@ -17 +17 @@
 #include <tchdb.h>
 #include <tcutil.h>
+#include <limits.h>
+
+#if PY_VERSION_HEX < 0x02050000
+typedef inquiry lenfunc;
+#endif
 
 /* FIXME: handle error */
@@ -27 +32 @@
   iter_item
 } itertype;
+
+static bool
+char_bounds(short x) {
+  if (x < SCHAR_MIN) {
+    PyErr_SetString(PyExc_OverflowError,
+    "signed byte integer is less than minimum");
+    return false;
+  } else if (x > SCHAR_MAX) {
+    PyErr_SetString(PyExc_OverflowError,
+    "signed byte integer is greater than maximum");
+    return false;
+  } else {
+    return true;
+  }
+}
 
 /* Error Objects */
@@ -511 +531 @@
   a(PyTCHDB *self, PyObject *args, PyObject *keywds) { \
     bool result; \
-    char apow, fpow; \
+    short apow, fpow; \
     PY_LONG_LONG bnum; \
     unsigned char opts; \
     static char *kwlist[] = {"bnum", "apow", "fpow", "opts", NULL}; \
   \
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "LbbB:" #b, kwlist, \
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "LhhB:" #b, kwlist, \
                                      &bnum, &apow, &fpow, &opts)) { \
+      return NULL; \
+    } \
+    if (!(char_bounds(apow) && char_bounds(fpow))) { \
       return NULL; \
     } \
@@ -1239 +1262 @@
   a(PyTCBDB *self, PyObject *args, PyObject *keywds) { \
     bool result; \
-    char apow, fpow; \
+    short apow, fpow; \
     int lmemb, nmemb; \
     PY_LONG_LONG bnum; \
@@ -1245 +1268 @@
     static char *kwlist[] = {"lmemb", "nmemb", "bnum", "apow", "fpow", "opts", NULL}; \
   \
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "iiLbbB:" #b, kwlist, \
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "iiLhhB:" #b, kwlist, \
                                      &lmemb, &nmemb, &bnum, \
                                      &apow, &fpow, &opts)) { \
+      return NULL; \
+    } \
+    if (!(char_bounds(apow) && char_bounds(fpow))) { \
       return NULL; \
     } \

lang/python/pytc/trunk/setup.py

@@ -18 +18 @@
 
 ext = Extension('pytc',
-                libraries = ['tokyocabinet', 'z', 'pthread', 'm', 'c'],
+                libraries = ['tokyocabinet'],
                 sources = ['pytc.c'],
                 include_dirs = include_dirs,
@@ -25 +25 @@
 
 setup(name = 'pytc',
-      version = '0.6',
+      version = '0.7',
       description = 'Tokyo Cabinet Python bindings',
       long_description = '''