mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue 2168. gdbm and dbm needs to be iterable; this fixes a

Browse source 
failure in the shelve module.  Thanks Thomas Herve.
This commit is contained in:
Facundo Batista 2008-02-25 22:33:55 +00:00
parent fd429063e1
commit df4198915a
2 changed files with 68 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Modules/dbmmodule.c
View file

@ -161,6 +161,37 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
return 0; return 0;
} }
static int
dbm_contains(register dbmobject *dp, PyObject *v)
{
datum key, val;
if (PyString_AsStringAndSize(v, &key.dptr, &key.dsize)) {
return -1;
}
/* Expand check_dbmobject_open to return -1 */
if (dp->di_dbm == NULL) {
PyErr_SetString(DbmError, "DBM object has already been closed");
return -1;
}
val = dbm_fetch(dp->di_dbm, key);
return val.dptr != NULL;
}
static PySequenceMethods dbm_as_sequence = {
(lenfunc)dbm_length, /*_length*/
0, /*sq_concat*/
0, /*sq_repeat*/
0, /*sq_item*/
0, /*sq_slice*/
0, /*sq_ass_item*/
0, /*sq_ass_slice*/
(objobjproc)dbm_contains, /*sq_contains*/
0, /*sq_inplace_concat*/
0 /*sq_inplace_repeat*/
};
static PyMappingMethods dbm_as_mapping = { static PyMappingMethods dbm_as_mapping = {
(lenfunc)dbm_length, /*mp_length*/ (lenfunc)dbm_length, /*mp_length*/
(binaryfunc)dbm_subscript, /*mp_subscript*/ (binaryfunc)dbm_subscript, /*mp_subscript*/
@ -313,8 +344,15 @@ static PyTypeObject Dbmtype = {
0, /*tp_compare*/ 0, /*tp_compare*/
0, /*tp_repr*/ 0, /*tp_repr*/
0, /*tp_as_number*/ 0, /*tp_as_number*/
0, /*tp_as_sequence*/ &dbm_as_sequence, /*tp_as_sequence*/
&dbm_as_mapping, /*tp_as_mapping*/ &dbm_as_mapping, /*tp_as_mapping*/
0, /*tp_hash*/
0, /*tp_call*/
0, /*tp_str*/
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_xxx4*/
}; };
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */

31
Modules/gdbmmodule.c
View file

@ -178,6 +178,33 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
return 0; return 0;
} }
static int
dbm_contains(register dbmobject *dp, PyObject *v)
{
datum key;
if (PyString_AsStringAndSize(v, &key.dptr, &key.dsize)) {
return -1;
}
check_dbmobject_open(dp);
return gdbm_exists(dp->di_dbm, key);
}
static PySequenceMethods dbm_as_sequence = {
(lenfunc)dbm_length, /*_length*/
0, /*sq_concat*/
0, /*sq_repeat*/
0, /*sq_item*/
0, /*sq_slice*/
0, /*sq_ass_item*/
0, /*sq_ass_slice*/
(objobjproc)dbm_contains, /*sq_contains*/
0, /*sq_inplace_concat*/
0 /*sq_inplace_repeat*/
};
static PyMappingMethods dbm_as_mapping = { static PyMappingMethods dbm_as_mapping = {
(lenfunc)dbm_length, /*mp_length*/ (lenfunc)dbm_length, /*mp_length*/
(binaryfunc)dbm_subscript, /*mp_subscript*/ (binaryfunc)dbm_subscript, /*mp_subscript*/
@ -381,7 +408,7 @@ static PyTypeObject Dbmtype = {
0, /*tp_compare*/ 0, /*tp_compare*/
0, /*tp_repr*/ 0, /*tp_repr*/
0, /*tp_as_number*/ 0, /*tp_as_number*/
0, /*tp_as_sequence*/ &dbm_as_sequence, /*tp_as_sequence*/
&dbm_as_mapping, /*tp_as_mapping*/ &dbm_as_mapping, /*tp_as_mapping*/
0, /*tp_hash*/ 0, /*tp_hash*/
0, /*tp_call*/ 0, /*tp_call*/
@ -389,7 +416,7 @@ static PyTypeObject Dbmtype = {
0, /*tp_getattro*/ 0, /*tp_getattro*/
0, /*tp_setattro*/ 0, /*tp_setattro*/
0, /*tp_as_buffer*/ 0, /*tp_as_buffer*/
0, /*tp_xxx4*/ Py_TPFLAGS_DEFAULT, /*tp_xxx4*/
gdbm_object__doc__, /*tp_doc*/ gdbm_object__doc__, /*tp_doc*/
}; };