Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 1 | /*********************************************************** |
| 2 | Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, |
| 3 | The Netherlands. |
| 4 | |
| 5 | All Rights Reserved |
| 6 | |
Guido van Rossum | fd71b9e | 2000-06-30 23:50:40 +0000 | [diff] [blame^] | 7 | Copyright (c) 2000, BeOpen.com. |
| 8 | Copyright (c) 1995-2000, Corporation for National Research Initiatives. |
| 9 | Copyright (c) 1990-1995, Stichting Mathematisch Centrum. |
| 10 | All rights reserved. |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 11 | |
Guido van Rossum | fd71b9e | 2000-06-30 23:50:40 +0000 | [diff] [blame^] | 12 | See the file "Misc/COPYRIGHT" for information on usage and |
| 13 | redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 14 | |
| 15 | ******************************************************************/ |
| 16 | |
| 17 | /* Berkeley DB interface. |
| 18 | Author: Michael McLay |
| 19 | Hacked: Guido van Rossum |
| 20 | Btree and Recno additions plus sequence methods: David Ely |
| 21 | |
| 22 | XXX To do: |
| 23 | - provide interface to the B-tree and record libraries too |
| 24 | - provide a way to access the various hash functions |
| 25 | - support more open flags |
Guido van Rossum | 675e994 | 1999-09-20 13:28:18 +0000 | [diff] [blame] | 26 | |
| 27 | The windows port of the Berkeley DB code is hard to find on the web: |
| 28 | www.nightmare.com/software.html |
| 29 | */ |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 30 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 31 | #include "Python.h" |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 32 | #ifdef WITH_THREAD |
Guido van Rossum | 49b5606 | 1998-10-01 20:42:43 +0000 | [diff] [blame] | 33 | #include "pythread.h" |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 34 | #endif |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 35 | |
| 36 | #include <sys/types.h> |
| 37 | #include <sys/stat.h> |
| 38 | #include <fcntl.h> |
Fred Drake | 947121f | 2000-06-30 04:17:11 +0000 | [diff] [blame] | 39 | /* If using Berkeley DB 2.0 or newer, change this include to <db_185.h>: */ |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 40 | #include <db.h> |
| 41 | /* Please don't include internal header files of the Berkeley db package |
| 42 | (it messes up the info required in the Setup file) */ |
| 43 | |
| 44 | typedef struct { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 45 | PyObject_HEAD |
| 46 | DB *di_bsddb; |
| 47 | int di_size; /* -1 means recompute */ |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 48 | #ifdef WITH_THREAD |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 49 | PyThread_type_lock di_lock; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 50 | #endif |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 51 | } bsddbobject; |
| 52 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 53 | staticforward PyTypeObject Bsddbtype; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 54 | |
| 55 | #define is_bsddbobject(v) ((v)->ob_type == &Bsddbtype) |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 56 | #define check_bsddbobject_open(v) if ((v)->di_bsddb == NULL) \ |
| 57 | { PyErr_SetString(BsddbError, "BSDDB object has already been closed"); \ |
| 58 | return NULL; } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 59 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 60 | static PyObject *BsddbError; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 61 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 62 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 63 | newdbhashobject(file, flags, mode, |
| 64 | bsize, ffactor, nelem, cachesize, hash, lorder) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 65 | char *file; |
| 66 | int flags; |
| 67 | int mode; |
| 68 | int bsize; |
| 69 | int ffactor; |
| 70 | int nelem; |
| 71 | int cachesize; |
| 72 | int hash; /* XXX ignored */ |
| 73 | int lorder; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 74 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 75 | bsddbobject *dp; |
| 76 | HASHINFO info; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 77 | |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 78 | if ((dp = PyObject_New(bsddbobject, &Bsddbtype)) == NULL) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 79 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 80 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 81 | info.bsize = bsize; |
| 82 | info.ffactor = ffactor; |
| 83 | info.nelem = nelem; |
| 84 | info.cachesize = cachesize; |
| 85 | info.hash = NULL; /* XXX should derive from hash argument */ |
| 86 | info.lorder = lorder; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 87 | |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 88 | #ifdef O_BINARY |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 89 | flags |= O_BINARY; |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 90 | #endif |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 91 | Py_BEGIN_ALLOW_THREADS |
| 92 | dp->di_bsddb = dbopen(file, flags, mode, DB_HASH, &info); |
| 93 | Py_END_ALLOW_THREADS |
| 94 | if (dp->di_bsddb == NULL) { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 95 | PyErr_SetFromErrno(BsddbError); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 96 | #ifdef WITH_THREAD |
| 97 | dp->di_lock = NULL; |
| 98 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 99 | Py_DECREF(dp); |
| 100 | return NULL; |
| 101 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 102 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 103 | dp->di_size = -1; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 104 | #ifdef WITH_THREAD |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 105 | dp->di_lock = PyThread_allocate_lock(); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 106 | if (dp->di_lock == NULL) { |
| 107 | PyErr_SetString(BsddbError, "can't allocate lock"); |
| 108 | Py_DECREF(dp); |
| 109 | return NULL; |
| 110 | } |
| 111 | #endif |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 112 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 113 | return (PyObject *)dp; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 114 | } |
| 115 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 116 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 117 | newdbbtobject(file, flags, mode, |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 118 | btflags, cachesize, maxkeypage, minkeypage, psize, lorder) |
| 119 | char *file; |
| 120 | int flags; |
| 121 | int mode; |
| 122 | int btflags; |
| 123 | int cachesize; |
| 124 | int maxkeypage; |
| 125 | int minkeypage; |
| 126 | int psize; |
| 127 | int lorder; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 128 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 129 | bsddbobject *dp; |
| 130 | BTREEINFO info; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 131 | |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 132 | if ((dp = PyObject_New(bsddbobject, &Bsddbtype)) == NULL) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 133 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 134 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 135 | info.flags = btflags; |
| 136 | info.cachesize = cachesize; |
| 137 | info.maxkeypage = maxkeypage; |
| 138 | info.minkeypage = minkeypage; |
| 139 | info.psize = psize; |
| 140 | info.lorder = lorder; |
| 141 | info.compare = 0; /* Use default comparison functions, for now..*/ |
| 142 | info.prefix = 0; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 143 | |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 144 | #ifdef O_BINARY |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 145 | flags |= O_BINARY; |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 146 | #endif |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 147 | Py_BEGIN_ALLOW_THREADS |
| 148 | dp->di_bsddb = dbopen(file, flags, mode, DB_BTREE, &info); |
| 149 | Py_END_ALLOW_THREADS |
| 150 | if (dp->di_bsddb == NULL) { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 151 | PyErr_SetFromErrno(BsddbError); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 152 | #ifdef WITH_THREAD |
| 153 | dp->di_lock = NULL; |
| 154 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 155 | Py_DECREF(dp); |
| 156 | return NULL; |
| 157 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 158 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 159 | dp->di_size = -1; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 160 | #ifdef WITH_THREAD |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 161 | dp->di_lock = PyThread_allocate_lock(); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 162 | if (dp->di_lock == NULL) { |
| 163 | PyErr_SetString(BsddbError, "can't allocate lock"); |
| 164 | Py_DECREF(dp); |
| 165 | return NULL; |
| 166 | } |
| 167 | #endif |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 168 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 169 | return (PyObject *)dp; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 170 | } |
| 171 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 172 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 173 | newdbrnobject(file, flags, mode, |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 174 | rnflags, cachesize, psize, lorder, reclen, bval, bfname) |
| 175 | char *file; |
| 176 | int flags; |
| 177 | int mode; |
| 178 | int rnflags; |
| 179 | int cachesize; |
| 180 | int psize; |
| 181 | int lorder; |
| 182 | size_t reclen; |
| 183 | u_char bval; |
| 184 | char *bfname; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 185 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 186 | bsddbobject *dp; |
| 187 | RECNOINFO info; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 188 | |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 189 | if ((dp = PyObject_New(bsddbobject, &Bsddbtype)) == NULL) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 190 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 191 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 192 | info.flags = rnflags; |
| 193 | info.cachesize = cachesize; |
| 194 | info.psize = psize; |
| 195 | info.lorder = lorder; |
| 196 | info.reclen = reclen; |
| 197 | info.bval = bval; |
| 198 | info.bfname = bfname; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 199 | |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 200 | #ifdef O_BINARY |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 201 | flags |= O_BINARY; |
Guido van Rossum | 6beb479 | 1996-09-11 23:22:25 +0000 | [diff] [blame] | 202 | #endif |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 203 | Py_BEGIN_ALLOW_THREADS |
| 204 | dp->di_bsddb = dbopen(file, flags, mode, DB_RECNO, &info); |
| 205 | Py_END_ALLOW_THREADS |
| 206 | if (dp->di_bsddb == NULL) { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 207 | PyErr_SetFromErrno(BsddbError); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 208 | #ifdef WITH_THREAD |
| 209 | dp->di_lock = NULL; |
| 210 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 211 | Py_DECREF(dp); |
| 212 | return NULL; |
| 213 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 214 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 215 | dp->di_size = -1; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 216 | #ifdef WITH_THREAD |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 217 | dp->di_lock = PyThread_allocate_lock(); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 218 | if (dp->di_lock == NULL) { |
| 219 | PyErr_SetString(BsddbError, "can't allocate lock"); |
| 220 | Py_DECREF(dp); |
| 221 | return NULL; |
| 222 | } |
| 223 | #endif |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 224 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 225 | return (PyObject *)dp; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 226 | } |
| 227 | |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 228 | static void |
| 229 | bsddb_dealloc(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 230 | bsddbobject *dp; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 231 | { |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 232 | #ifdef WITH_THREAD |
| 233 | if (dp->di_lock) { |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 234 | PyThread_acquire_lock(dp->di_lock, 0); |
| 235 | PyThread_release_lock(dp->di_lock); |
| 236 | PyThread_free_lock(dp->di_lock); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 237 | dp->di_lock = NULL; |
| 238 | } |
| 239 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 240 | if (dp->di_bsddb != NULL) { |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 241 | int status; |
| 242 | Py_BEGIN_ALLOW_THREADS |
| 243 | status = (dp->di_bsddb->close)(dp->di_bsddb); |
| 244 | Py_END_ALLOW_THREADS |
| 245 | if (status != 0) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 246 | fprintf(stderr, |
| 247 | "Python bsddb: close errno %d in dealloc\n", |
| 248 | errno); |
| 249 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 250 | PyObject_Del(dp); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 251 | } |
| 252 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 253 | #ifdef WITH_THREAD |
Guido van Rossum | 65d5b57 | 1998-12-21 19:32:43 +0000 | [diff] [blame] | 254 | #define BSDDB_BGN_SAVE(_dp) Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(_dp->di_lock,1); |
| 255 | #define BSDDB_END_SAVE(_dp) PyThread_release_lock(_dp->di_lock); Py_END_ALLOW_THREADS |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 256 | #else |
| 257 | #define BSDDB_BGN_SAVE(_dp) Py_BEGIN_ALLOW_THREADS |
| 258 | #define BSDDB_END_SAVE(_dp) Py_END_ALLOW_THREADS |
| 259 | #endif |
| 260 | |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 261 | static int |
| 262 | bsddb_length(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 263 | bsddbobject *dp; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 264 | { |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 265 | if (dp->di_bsddb == NULL) { |
| 266 | PyErr_SetString(BsddbError, "BSDDB object has already been closed"); |
| 267 | return -1; |
| 268 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 269 | if (dp->di_size < 0) { |
| 270 | DBT krec, drec; |
| 271 | int status; |
| 272 | int size = 0; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 273 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 274 | for (status = (dp->di_bsddb->seq)(dp->di_bsddb, |
| 275 | &krec, &drec,R_FIRST); |
| 276 | status == 0; |
| 277 | status = (dp->di_bsddb->seq)(dp->di_bsddb, |
| 278 | &krec, &drec, R_NEXT)) |
| 279 | size++; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 280 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 281 | if (status < 0) { |
| 282 | PyErr_SetFromErrno(BsddbError); |
| 283 | return -1; |
| 284 | } |
| 285 | dp->di_size = size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 286 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 287 | return dp->di_size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 288 | } |
| 289 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 290 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 291 | bsddb_subscript(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 292 | bsddbobject *dp; |
| 293 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 294 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 295 | int status; |
| 296 | DBT krec, drec; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 297 | char *data,buf[4096]; |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 298 | int size; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 299 | PyObject *result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 300 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 301 | if (!PyArg_Parse(key, "s#", &data, &size)) |
| 302 | return NULL; |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 303 | check_bsddbobject_open(dp); |
| 304 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 305 | krec.data = data; |
| 306 | krec.size = size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 307 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 308 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 309 | status = (dp->di_bsddb->get)(dp->di_bsddb, &krec, &drec, 0); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 310 | if (status == 0) { |
| 311 | if (drec.size > sizeof(buf)) data = malloc(drec.size); |
| 312 | else data = buf; |
| 313 | memcpy(data,drec.data,drec.size); |
| 314 | } |
| 315 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 316 | if (status != 0) { |
| 317 | if (status < 0) |
| 318 | PyErr_SetFromErrno(BsddbError); |
| 319 | else |
| 320 | PyErr_SetObject(PyExc_KeyError, key); |
| 321 | return NULL; |
| 322 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 323 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 324 | result = PyString_FromStringAndSize(data, (int)drec.size); |
| 325 | if (data != buf) free(data); |
| 326 | return result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 327 | } |
| 328 | |
| 329 | static int |
| 330 | bsddb_ass_sub(dp, key, value) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 331 | bsddbobject *dp; |
| 332 | PyObject *key, *value; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 333 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 334 | int status; |
| 335 | DBT krec, drec; |
| 336 | char *data; |
| 337 | int size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 338 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 339 | if (!PyArg_Parse(key, "s#", &data, &size)) { |
| 340 | PyErr_SetString(PyExc_TypeError, |
| 341 | "bsddb key type must be string"); |
| 342 | return -1; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 343 | } |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 344 | if (dp->di_bsddb == NULL) { |
| 345 | PyErr_SetString(BsddbError, "BSDDB object has already been closed"); |
| 346 | return -1; |
| 347 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 348 | krec.data = data; |
| 349 | krec.size = size; |
| 350 | dp->di_size = -1; |
| 351 | if (value == NULL) { |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 352 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 353 | status = (dp->di_bsddb->del)(dp->di_bsddb, &krec, 0); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 354 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 355 | } |
| 356 | else { |
| 357 | if (!PyArg_Parse(value, "s#", &data, &size)) { |
| 358 | PyErr_SetString(PyExc_TypeError, |
| 359 | "bsddb value type must be string"); |
| 360 | return -1; |
| 361 | } |
| 362 | drec.data = data; |
| 363 | drec.size = size; |
| 364 | #if 0 |
| 365 | /* For RECNO, put fails with 'No space left on device' |
| 366 | after a few short records are added?? Looks fine |
| 367 | to this point... linked with 1.85 on Solaris Intel |
| 368 | Roger E. Masse 1/16/97 |
| 369 | */ |
| 370 | printf("before put data: '%s', size: %d\n", |
| 371 | drec.data, drec.size); |
| 372 | printf("before put key= '%s', size= %d\n", |
| 373 | krec.data, krec.size); |
| 374 | #endif |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 375 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 376 | status = (dp->di_bsddb->put)(dp->di_bsddb, &krec, &drec, 0); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 377 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 378 | } |
| 379 | if (status != 0) { |
| 380 | if (status < 0) |
| 381 | PyErr_SetFromErrno(BsddbError); |
| 382 | else |
| 383 | PyErr_SetObject(PyExc_KeyError, key); |
| 384 | return -1; |
| 385 | } |
| 386 | return 0; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 387 | } |
| 388 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 389 | static PyMappingMethods bsddb_as_mapping = { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 390 | (inquiry)bsddb_length, /*mp_length*/ |
| 391 | (binaryfunc)bsddb_subscript, /*mp_subscript*/ |
| 392 | (objobjargproc)bsddb_ass_sub, /*mp_ass_subscript*/ |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 393 | }; |
| 394 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 395 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 396 | bsddb_close(dp, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 397 | bsddbobject *dp; |
| 398 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 399 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 400 | if (!PyArg_NoArgs(args)) |
| 401 | return NULL; |
| 402 | if (dp->di_bsddb != NULL) { |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 403 | int status; |
| 404 | BSDDB_BGN_SAVE(dp) |
| 405 | status = (dp->di_bsddb->close)(dp->di_bsddb); |
| 406 | BSDDB_END_SAVE(dp) |
| 407 | if (status != 0) { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 408 | dp->di_bsddb = NULL; |
| 409 | PyErr_SetFromErrno(BsddbError); |
| 410 | return NULL; |
| 411 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 412 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 413 | dp->di_bsddb = NULL; |
| 414 | Py_INCREF(Py_None); |
| 415 | return Py_None; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 416 | } |
| 417 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 418 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 419 | bsddb_keys(dp, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 420 | bsddbobject *dp; |
| 421 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 422 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 423 | PyObject *list, *item; |
| 424 | DBT krec, drec; |
Guido van Rossum | 730806d | 1998-04-10 22:27:42 +0000 | [diff] [blame] | 425 | char *data=NULL,buf[4096]; |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 426 | int status; |
| 427 | int err; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 428 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 429 | if (!PyArg_NoArgs(args)) |
| 430 | return NULL; |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 431 | check_bsddbobject_open(dp); |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 432 | list = PyList_New(0); |
| 433 | if (list == NULL) |
| 434 | return NULL; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 435 | BSDDB_BGN_SAVE(dp) |
| 436 | status = (dp->di_bsddb->seq)(dp->di_bsddb, &krec, &drec, R_FIRST); |
| 437 | if (status == 0) { |
| 438 | if (krec.size > sizeof(buf)) data = malloc(krec.size); |
| 439 | else data = buf; |
| 440 | memcpy(data,krec.data,krec.size); |
| 441 | } |
| 442 | BSDDB_END_SAVE(dp) |
| 443 | while (status == 0) { |
| 444 | item = PyString_FromStringAndSize(data, (int)krec.size); |
| 445 | if (data != buf) free(data); |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 446 | if (item == NULL) { |
| 447 | Py_DECREF(list); |
| 448 | return NULL; |
| 449 | } |
| 450 | err = PyList_Append(list, item); |
| 451 | Py_DECREF(item); |
| 452 | if (err != 0) { |
| 453 | Py_DECREF(list); |
| 454 | return NULL; |
| 455 | } |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 456 | BSDDB_BGN_SAVE(dp) |
| 457 | status = (dp->di_bsddb->seq)(dp->di_bsddb, &krec, &drec, R_NEXT); |
| 458 | if (status == 0) { |
| 459 | if (krec.size > sizeof(buf)) data = malloc(krec.size); |
| 460 | else data = buf; |
| 461 | memcpy(data,krec.data,krec.size); |
| 462 | } |
| 463 | BSDDB_END_SAVE(dp) |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 464 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 465 | if (status < 0) { |
| 466 | PyErr_SetFromErrno(BsddbError); |
| 467 | Py_DECREF(list); |
| 468 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 469 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 470 | if (dp->di_size < 0) |
| 471 | dp->di_size = PyList_Size(list); /* We just did the work */ |
| 472 | return list; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 473 | } |
| 474 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 475 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 476 | bsddb_has_key(dp, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 477 | bsddbobject *dp; |
| 478 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 479 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 480 | DBT krec, drec; |
| 481 | int status; |
| 482 | char *data; |
| 483 | int size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 484 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 485 | if (!PyArg_Parse(args, "s#", &data, &size)) |
| 486 | return NULL; |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 487 | check_bsddbobject_open(dp); |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 488 | krec.data = data; |
| 489 | krec.size = size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 490 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 491 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 492 | status = (dp->di_bsddb->get)(dp->di_bsddb, &krec, &drec, 0); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 493 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 494 | if (status < 0) { |
| 495 | PyErr_SetFromErrno(BsddbError); |
| 496 | return NULL; |
| 497 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 498 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 499 | return PyInt_FromLong(status == 0); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 500 | } |
| 501 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 502 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 503 | bsddb_set_location(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 504 | bsddbobject *dp; |
| 505 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 506 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 507 | int status; |
| 508 | DBT krec, drec; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 509 | char *data,buf[4096]; |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 510 | int size; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 511 | PyObject *result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 512 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 513 | if (!PyArg_Parse(key, "s#", &data, &size)) |
| 514 | return NULL; |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 515 | check_bsddbobject_open(dp); |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 516 | krec.data = data; |
| 517 | krec.size = size; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 518 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 519 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 520 | status = (dp->di_bsddb->seq)(dp->di_bsddb, &krec, &drec, R_CURSOR); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 521 | if (status == 0) { |
| 522 | if (drec.size > sizeof(buf)) data = malloc(drec.size); |
| 523 | else data = buf; |
| 524 | memcpy(data,drec.data,drec.size); |
| 525 | } |
| 526 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 527 | if (status != 0) { |
| 528 | if (status < 0) |
| 529 | PyErr_SetFromErrno(BsddbError); |
| 530 | else |
| 531 | PyErr_SetObject(PyExc_KeyError, key); |
| 532 | return NULL; |
| 533 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 534 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 535 | result = Py_BuildValue("s#s#", krec.data, krec.size, data, drec.size); |
| 536 | if (data != buf) free(data); |
| 537 | return result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 538 | } |
| 539 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 540 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 541 | bsddb_seq(dp, args, sequence_request) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 542 | bsddbobject *dp; |
| 543 | PyObject *args; |
| 544 | int sequence_request; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 545 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 546 | int status; |
| 547 | DBT krec, drec; |
Guido van Rossum | 730806d | 1998-04-10 22:27:42 +0000 | [diff] [blame] | 548 | char *kdata=NULL,kbuf[4096]; |
| 549 | char *ddata=NULL,dbuf[4096]; |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 550 | PyObject *result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 551 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 552 | if (!PyArg_NoArgs(args)) |
| 553 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 554 | |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 555 | check_bsddbobject_open(dp); |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 556 | krec.data = 0; |
| 557 | krec.size = 0; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 558 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 559 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 560 | status = (dp->di_bsddb->seq)(dp->di_bsddb, &krec, |
| 561 | &drec, sequence_request); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 562 | if (status == 0) { |
| 563 | if (krec.size > sizeof(kbuf)) kdata = malloc(krec.size); |
| 564 | else kdata = kbuf; |
| 565 | memcpy(kdata,krec.data,krec.size); |
| 566 | if (drec.size > sizeof(dbuf)) ddata = malloc(drec.size); |
| 567 | else ddata = dbuf; |
| 568 | memcpy(ddata,drec.data,drec.size); |
| 569 | } |
| 570 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 571 | if (status != 0) { |
| 572 | if (status < 0) |
| 573 | PyErr_SetFromErrno(BsddbError); |
| 574 | else |
| 575 | PyErr_SetObject(PyExc_KeyError, args); |
| 576 | return NULL; |
| 577 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 578 | |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 579 | result = Py_BuildValue("s#s#", kdata, krec.size, ddata, drec.size); |
| 580 | if (kdata != kbuf) free(kdata); |
| 581 | if (ddata != dbuf) free(ddata); |
| 582 | return result; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 583 | } |
| 584 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 585 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 586 | bsddb_next(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 587 | bsddbobject *dp; |
| 588 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 589 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 590 | return bsddb_seq(dp, key, R_NEXT); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 591 | } |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 592 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 593 | bsddb_previous(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 594 | bsddbobject *dp; |
| 595 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 596 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 597 | return bsddb_seq(dp, key, R_PREV); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 598 | } |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 599 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 600 | bsddb_first(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 601 | bsddbobject *dp; |
| 602 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 603 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 604 | return bsddb_seq(dp, key, R_FIRST); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 605 | } |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 606 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 607 | bsddb_last(dp, key) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 608 | bsddbobject *dp; |
| 609 | PyObject *key; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 610 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 611 | return bsddb_seq(dp, key, R_LAST); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 612 | } |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 613 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 614 | bsddb_sync(dp, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 615 | bsddbobject *dp; |
| 616 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 617 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 618 | int status; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 619 | |
Guido van Rossum | 77eecfa | 1997-07-17 22:56:01 +0000 | [diff] [blame] | 620 | if (!PyArg_NoArgs(args)) |
| 621 | return NULL; |
| 622 | check_bsddbobject_open(dp); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 623 | BSDDB_BGN_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 624 | status = (dp->di_bsddb->sync)(dp->di_bsddb, 0); |
Guido van Rossum | 4f199ea | 1998-04-09 20:56:35 +0000 | [diff] [blame] | 625 | BSDDB_END_SAVE(dp) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 626 | if (status != 0) { |
| 627 | PyErr_SetFromErrno(BsddbError); |
| 628 | return NULL; |
| 629 | } |
| 630 | return PyInt_FromLong(status = 0); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 631 | } |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 632 | static PyMethodDef bsddb_methods[] = { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 633 | {"close", (PyCFunction)bsddb_close}, |
| 634 | {"keys", (PyCFunction)bsddb_keys}, |
| 635 | {"has_key", (PyCFunction)bsddb_has_key}, |
| 636 | {"set_location", (PyCFunction)bsddb_set_location}, |
| 637 | {"next", (PyCFunction)bsddb_next}, |
| 638 | {"previous", (PyCFunction)bsddb_previous}, |
| 639 | {"first", (PyCFunction)bsddb_first}, |
| 640 | {"last", (PyCFunction)bsddb_last}, |
| 641 | {"sync", (PyCFunction)bsddb_sync}, |
| 642 | {NULL, NULL} /* sentinel */ |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 643 | }; |
| 644 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 645 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 646 | bsddb_getattr(dp, name) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 647 | PyObject *dp; |
| 648 | char *name; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 649 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 650 | return Py_FindMethod(bsddb_methods, dp, name); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 651 | } |
| 652 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 653 | static PyTypeObject Bsddbtype = { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 654 | PyObject_HEAD_INIT(NULL) |
| 655 | 0, |
| 656 | "bsddb", |
| 657 | sizeof(bsddbobject), |
| 658 | 0, |
| 659 | (destructor)bsddb_dealloc, /*tp_dealloc*/ |
| 660 | 0, /*tp_print*/ |
| 661 | (getattrfunc)bsddb_getattr, /*tp_getattr*/ |
| 662 | 0, /*tp_setattr*/ |
| 663 | 0, /*tp_compare*/ |
| 664 | 0, /*tp_repr*/ |
| 665 | 0, /*tp_as_number*/ |
| 666 | 0, /*tp_as_sequence*/ |
| 667 | &bsddb_as_mapping, /*tp_as_mapping*/ |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 668 | }; |
| 669 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 670 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 671 | bsdhashopen(self, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 672 | PyObject *self; |
| 673 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 674 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 675 | char *file; |
| 676 | char *flag = NULL; |
| 677 | int flags = O_RDONLY; |
| 678 | int mode = 0666; |
| 679 | int bsize = 0; |
| 680 | int ffactor = 0; |
| 681 | int nelem = 0; |
| 682 | int cachesize = 0; |
| 683 | int hash = 0; /* XXX currently ignored */ |
| 684 | int lorder = 0; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 685 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 686 | if (!PyArg_ParseTuple(args, "s|siiiiiii:hashopen", |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 687 | &file, &flag, &mode, |
| 688 | &bsize, &ffactor, &nelem, &cachesize, |
| 689 | &hash, &lorder)) |
| 690 | return NULL; |
| 691 | if (flag != NULL) { |
| 692 | /* XXX need to pass O_EXCL, O_EXLOCK, O_NONBLOCK, O_SHLOCK */ |
| 693 | if (flag[0] == 'r') |
| 694 | flags = O_RDONLY; |
| 695 | else if (flag[0] == 'w') |
| 696 | flags = O_RDWR; |
| 697 | else if (flag[0] == 'c') |
| 698 | flags = O_RDWR|O_CREAT; |
| 699 | else if (flag[0] == 'n') |
| 700 | flags = O_RDWR|O_CREAT|O_TRUNC; |
| 701 | else { |
| 702 | PyErr_SetString(BsddbError, |
| 703 | "Flag should begin with 'r', 'w', 'c' or 'n'"); |
| 704 | return NULL; |
| 705 | } |
| 706 | if (flag[1] == 'l') { |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 707 | #if defined(O_EXLOCK) && defined(O_SHLOCK) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 708 | if (flag[0] == 'r') |
| 709 | flags |= O_SHLOCK; |
| 710 | else |
| 711 | flags |= O_EXLOCK; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 712 | #else |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 713 | PyErr_SetString(BsddbError, |
| 714 | "locking not supported on this platform"); |
| 715 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 716 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 717 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 718 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 719 | return newdbhashobject(file, flags, mode, |
| 720 | bsize, ffactor, nelem, cachesize, hash, lorder); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 721 | } |
| 722 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 723 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 724 | bsdbtopen(self, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 725 | PyObject *self; |
| 726 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 727 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 728 | char *file; |
| 729 | char *flag = NULL; |
| 730 | int flags = O_RDONLY; |
| 731 | int mode = 0666; |
| 732 | int cachesize = 0; |
| 733 | int maxkeypage = 0; |
| 734 | int minkeypage = 0; |
| 735 | int btflags = 0; |
| 736 | unsigned int psize = 0; |
| 737 | int lorder = 0; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 738 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 739 | if (!PyArg_ParseTuple(args, "s|siiiiiii:btopen", |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 740 | &file, &flag, &mode, |
| 741 | &btflags, &cachesize, &maxkeypage, &minkeypage, |
| 742 | &psize, &lorder)) |
| 743 | return NULL; |
| 744 | if (flag != NULL) { |
| 745 | /* XXX need to pass O_EXCL, O_EXLOCK, O_NONBLOCK, O_SHLOCK */ |
| 746 | if (flag[0] == 'r') |
| 747 | flags = O_RDONLY; |
| 748 | else if (flag[0] == 'w') |
| 749 | flags = O_RDWR; |
| 750 | else if (flag[0] == 'c') |
| 751 | flags = O_RDWR|O_CREAT; |
| 752 | else if (flag[0] == 'n') |
| 753 | flags = O_RDWR|O_CREAT|O_TRUNC; |
| 754 | else { |
| 755 | PyErr_SetString(BsddbError, |
| 756 | "Flag should begin with 'r', 'w', 'c' or 'n'"); |
| 757 | return NULL; |
| 758 | } |
| 759 | if (flag[1] == 'l') { |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 760 | #if defined(O_EXLOCK) && defined(O_SHLOCK) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 761 | if (flag[0] == 'r') |
| 762 | flags |= O_SHLOCK; |
| 763 | else |
| 764 | flags |= O_EXLOCK; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 765 | #else |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 766 | PyErr_SetString(BsddbError, |
| 767 | "locking not supported on this platform"); |
| 768 | return NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 769 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 770 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 771 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 772 | return newdbbtobject(file, flags, mode, |
| 773 | btflags, cachesize, maxkeypage, minkeypage, |
| 774 | psize, lorder); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 775 | } |
Guido van Rossum | dd96ca7 | 1996-05-23 22:57:54 +0000 | [diff] [blame] | 776 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 777 | static PyObject * |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 778 | bsdrnopen(self, args) |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 779 | PyObject *self; |
| 780 | PyObject *args; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 781 | { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 782 | char *file; |
| 783 | char *flag = NULL; |
| 784 | int flags = O_RDONLY; |
| 785 | int mode = 0666; |
| 786 | int cachesize = 0; |
| 787 | int rnflags = 0; |
| 788 | unsigned int psize = 0; |
| 789 | int lorder = 0; |
| 790 | size_t reclen = 0; |
| 791 | char *bval = ""; |
| 792 | char *bfname = NULL; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 793 | |
Guido van Rossum | 43713e5 | 2000-02-29 13:59:29 +0000 | [diff] [blame] | 794 | if (!PyArg_ParseTuple(args, "s|siiiiiiss:rnopen", |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 795 | &file, &flag, &mode, |
| 796 | &rnflags, &cachesize, &psize, &lorder, |
| 797 | &reclen, &bval, &bfname)) |
| 798 | return NULL; |
| 799 | |
| 800 | # if 0 |
| 801 | printf("file: %s\n", file); |
| 802 | printf("flag: %s\n", flag); |
| 803 | printf("mode: %d\n", mode); |
| 804 | printf("rnflags: 0x%x\n", rnflags); |
| 805 | printf("cachesize: %d\n", cachesize); |
| 806 | printf("psize: %d\n", psize); |
| 807 | printf("lorder: %d\n", 0); |
| 808 | printf("reclen: %d\n", reclen); |
| 809 | printf("bval: %c\n", bval[0]); |
| 810 | printf("bfname %s\n", bfname); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 811 | #endif |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 812 | |
| 813 | if (flag != NULL) { |
| 814 | /* XXX need to pass O_EXCL, O_EXLOCK, O_NONBLOCK, O_SHLOCK */ |
| 815 | if (flag[0] == 'r') |
| 816 | flags = O_RDONLY; |
| 817 | else if (flag[0] == 'w') |
| 818 | flags = O_RDWR; |
| 819 | else if (flag[0] == 'c') |
| 820 | flags = O_RDWR|O_CREAT; |
| 821 | else if (flag[0] == 'n') |
| 822 | flags = O_RDWR|O_CREAT|O_TRUNC; |
| 823 | else { |
| 824 | PyErr_SetString(BsddbError, |
| 825 | "Flag should begin with 'r', 'w', 'c' or 'n'"); |
| 826 | return NULL; |
| 827 | } |
| 828 | if (flag[1] == 'l') { |
| 829 | #if defined(O_EXLOCK) && defined(O_SHLOCK) |
| 830 | if (flag[0] == 'r') |
| 831 | flags |= O_SHLOCK; |
| 832 | else |
| 833 | flags |= O_EXLOCK; |
| 834 | #else |
| 835 | PyErr_SetString(BsddbError, |
| 836 | "locking not supported on this platform"); |
| 837 | return NULL; |
| 838 | #endif |
| 839 | } |
| 840 | else if (flag[1] != '\0') { |
| 841 | PyErr_SetString(BsddbError, |
| 842 | "Flag char 2 should be 'l' or absent"); |
| 843 | return NULL; |
| 844 | } |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 845 | } |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 846 | return newdbrnobject(file, flags, mode, rnflags, cachesize, |
| 847 | psize, lorder, reclen, bval[0], bfname); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 848 | } |
| 849 | |
Guido van Rossum | dfe8ad9 | 1996-07-24 00:51:20 +0000 | [diff] [blame] | 850 | static PyMethodDef bsddbmodule_methods[] = { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 851 | {"hashopen", (PyCFunction)bsdhashopen, 1}, |
| 852 | {"btopen", (PyCFunction)bsdbtopen, 1}, |
| 853 | {"rnopen", (PyCFunction)bsdrnopen, 1}, |
| 854 | {0, 0}, |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 855 | }; |
| 856 | |
Guido van Rossum | 3886bb6 | 1998-12-04 18:50:17 +0000 | [diff] [blame] | 857 | DL_EXPORT(void) |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 858 | initbsddb() { |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 859 | PyObject *m, *d; |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 860 | |
Roger E. Masse | d9240d1 | 1997-01-16 22:05:33 +0000 | [diff] [blame] | 861 | Bsddbtype.ob_type = &PyType_Type; |
| 862 | m = Py_InitModule("bsddb", bsddbmodule_methods); |
| 863 | d = PyModule_GetDict(m); |
Guido van Rossum | 0cb96de | 1997-10-01 04:29:29 +0000 | [diff] [blame] | 864 | BsddbError = PyErr_NewException("bsddb.error", NULL, NULL); |
| 865 | if (BsddbError != NULL) |
| 866 | PyDict_SetItemString(d, "error", BsddbError); |
Guido van Rossum | 1100dca | 1995-08-30 23:43:03 +0000 | [diff] [blame] | 867 | } |