Changeset 4919 for lang/python

Timestamp:

01/19/08 05:07:46 (5 years ago)

Author:

yappo

Message:

revert revision 4905, 4906, 4907, 4908, 4909

Location:

lang/python/pytc/tags/RELEASE-0.3

Files:

• ChangeLog (modified) (1 diff)
• pytc.c (modified) (11 diffs)
• setup.py (modified) (1 diff)
• tests/testBDB.py (modified) (1 diff)

lang/python/pytc/tags/RELEASE-0.3/ChangeLog

@@ +1 @@
+2007-12-30  Tasuku SUENAGA <gunyarakun@sourceforge.net>
+
+        * version 0.3
+        * modified setup.py for darwin
+        * added TCBDB.range and TCBDB.rangefwm
+
 2007-12-15  Tasuku SUENAGA <gunyarakun@sourceforge.net>
 

lang/python/pytc/tags/RELEASE-0.3/pytc.c

@@ -1 +1 @@
 /* Copyright(C) 2007- Tasuku SUENAGA
 
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <Python.h>
@@ -238 +236 @@
   \
     if (!PyArg_ParseTupleAndKeywords(args, keywds, "s#s#:" #method, kwlist, \
-                                     &key, &key_len, &value, &value_len)) { \
+                                     &key, &key_len, \
+                                     &value, &value_len)) { \
       return NULL; \
     } \
@@ -325 +324 @@
       return NULL; \
     } \
-    key = PyString_AS_STRING(_key); \
+    key = PyString_AsString(_key); \
     key_len = PyString_GET_SIZE(_key); \
     if (!key || !key_len) { \
@@ -347 +346 @@
   func(type *self, PyObject *_key) { \
     bool result; \
-    char *key = PyString_AS_STRING(_key); \
+    char *key = PyString_AsString(_key); \
     int key_len = PyString_GET_SIZE(_key); \
   \
@@ -368 +367 @@
   func(type *self, PyObject *_key, PyObject *_value) { \
     bool result; \
-    char *key = PyString_AS_STRING(_key), *value = PyString_AS_STRING(_value); \
+    char *key = PyString_AsString(_key), *value = PyString_AsString(_value); \
     int key_len = PyString_GET_SIZE(_key), value_len = PyString_GET_SIZE(_value); \
   \
@@ -399 +398 @@
   static int \
   func(type *self, PyObject *_key) { \
-    char *key = PyString_AS_STRING(_key); \
+    char *key = PyString_AsString(_key); \
     int key_len = PyString_GET_SIZE(_key), value_len; \
   \
@@ -422 +421 @@
   func(type *self, PyObject *_key) { \
     PyObject *ret; \
-    char *key = PyString_AS_STRING(_key), *value; \
+    char *key = PyString_AsString(_key), *value; \
     int key_len = PyString_GET_SIZE(_key), value_len; \
   \
@@ -476 +475 @@
   if (value) { tcxstrdel(value); } \
   return ret;
+
+#define TCLIST2PyList() \
+  if (!list) { \
+    raise_tcbdb_error(self->bdb); \
+    return NULL; \
+  } else { \
+    PyObject *ret; \
+    int i, n = tclistnum(list); \
+    if ((ret = PyList_New(n))) { \
+      for (i = 0; i < n; i++) { \
+        int value_len; \
+        PyObject *_value; \
+        const char *value; \
+        value = tclistval(list, i, &value_len); \
+        _value = PyString_FromStringAndSize(value, value_len); \
+        PyList_SET_ITEM(ret, i, _value); \
+      } \
+    } \
+    tclistdel(list); \
+    return ret; \
+  }
 
 /*** TCHDB ***/
@@ -1400 +1420 @@
   Py_END_ALLOW_THREADS
 
-  if (!list) {
-    raise_tcbdb_error(self->bdb);
-    return NULL;
-  } else {
-    PyObject *ret;
-    int i, n = tclistnum(list);
-    if ((ret = PyList_New(n))) {
-      for (i = 0; i < n; i++) {
-        int value_len;
-        PyObject *_value;
-        const char *value;
-        value = tclistval(list, i, &value_len);
-        _value = PyString_FromStringAndSize(value, value_len);
-        PyList_SET_ITEM(ret, i, _value);
-      }
-    }
-    tclistdel(list);
-    return ret;
-  }
+  TCLIST2PyList()
 }
 
@@ -1433 +1435 @@
 PY_U_LONG_LONG_NOARGS(PyTCBDB_rnum, PyTCBDB, tcbdbrnum, bdb, tcbdbecode, raise_tcbdb_error)
 PY_U_LONG_LONG_NOARGS(PyTCBDB_fsiz, PyTCBDB, tcbdbrnum, bdb, tcbdbecode, raise_tcbdb_error)
+
+static PyObject *
+PyTCBDB_range(PyTCBDB *self, PyObject *args, PyObject *keywds) {
+  TCLIST *list;
+  char *bkey, *ekey;
+  int bkey_len, binc, ekey_len, einc, max;
+  static char *kwlist[] = {"bkey", "binc", "ekey", "einc", "max", NULL};
+
+  if (!PyArg_ParseTupleAndKeywords(args, keywds, "z#iz#ii:range", kwlist,
+                                   &bkey, &bkey_len, &binc,
+                                   &ekey, &ekey_len, &einc, &max)) {
+    return NULL;
+  }
+  Py_BEGIN_ALLOW_THREADS
+  list = tcbdbrange(self->bdb, bkey, bkey_len, binc,
+                               ekey, ekey_len, einc, max);
+  Py_END_ALLOW_THREADS
+
+  TCLIST2PyList()
+}
+
+static PyObject *
+PyTCBDB_rangefwm(PyTCBDB *self, PyObject *args, PyObject *keywds) {
+  int max;
+  TCLIST *list;
+  char *prefix;
+  static char *kwlist[] = {"prefix", "max", NULL};
+
+  if (!PyArg_ParseTupleAndKeywords(args, keywds, "si:rangefwm", kwlist,
+                                   &prefix, &max)) {
+    return NULL;
+  }
+  Py_BEGIN_ALLOW_THREADS
+  list = tcbdbrange3(self->bdb, prefix, max);
+  Py_END_ALLOW_THREADS
+
+  TCLIST2PyList()
+}
 
 /* TODO: features for experts */
@@ -1726 +1766 @@
    METH_NOARGS,
    "Create a cursor object."},
+  {"range", (PyCFunction)PyTCBDB_range,
+   METH_VARARGS | METH_KEYWORDS,
+   ""},
+  {"rangefwm", (PyCFunction)PyTCBDB_rangefwm,
+   METH_VARARGS | METH_KEYWORDS,
+   ""},
   {"__contains__", (PyCFunction)PyTCBDB___contains__,
    METH_O | METH_COEXIST,

lang/python/pytc/tags/RELEASE-0.3/setup.py

@@ -25 +25 @@
 
 setup(name = 'pytc',
-      version = '0.2',
+      version = '0.3',
       description = 'Tokyo Cabinet Python bindings',
       long_description = '''

lang/python/pytc/tags/RELEASE-0.3/tests/testBDB.py

@@ -174 +174 @@
     self.assertEqual(db.get('moru'), 'pupupu')
 
+    db['nagasaki'] = 'ichiban'
+    db['nagasaki-higashi'] = 'toh'
+    db['nagasaki-nishi'] = 'zai'
+    db['nagasaki-minami'] = 'nan'
+    db['nagasaki-kita'] = 'boku'
+    db['nagasaki-hokuyodai'] = 'hokuyodai'
+    # range
+    self.assertEqual(db.range('nagasaki', False, 'nagasaki-kita', True, 3),
+                     ['nagasaki-higashi',
+                      'nagasaki-hokuyodai',
+                      'nagasaki-kita'])
+    # rangefwm
+    self.assertEqual(db.rangefwm('nagasaki', 5),
+                     ['nagasaki', 'nagasaki-higashi',
+                      'nagasaki-hokuyodai', 'nagasaki-kita',
+                      'nagasaki-minami'])
+
     # vanish
     db.vanish()