traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix this right for has_key(). This required adding tp_as_sequence.

This commit is contained in:
Guido van Rossum 2006-08-19 23:11:47 +00:00
parent e014a13f03
commit ef67111634
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Modules/dbmmodule.c
View File

@ -205,20 +205,42 @@ dbm_keys(register dbmobject *dp, PyObject *unused)
return v; return v;
} }
static PyObject * static int
dbm_contains(register dbmobject *dp, PyObject *args) dbm_contains(PyObject *self, PyObject *arg)
{ {
dbmobject *dp = (dbmobject *)self;
datum key, val; datum key, val;
int tmp_size;
if ((dp)->di_dbm == NULL) {
if (!PyArg_ParseTuple(args, "s#:__contains__", &key.dptr, &tmp_size)) PyErr_SetString(DbmError,
return NULL; "DBM object has already been closed");
key.dsize = tmp_size; return -1;
check_dbmobject_open(dp); }
if (!PyString_Check(arg)) {
PyErr_Format(PyExc_TypeError,
"dbm key must be string, not %.100s",
arg->ob_type->tp_name);
return -1;
}
key.dptr = PyString_AS_STRING(arg);
key.dsize = PyString_GET_SIZE(arg);
val = dbm_fetch(dp->di_dbm, key); val = dbm_fetch(dp->di_dbm, key);
return PyInt_FromLong(val.dptr != NULL); return val.dptr != NULL;
} }
static PySequenceMethods dbm_as_sequence = {
0, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
0, /* sq_item */
0, /* sq_slice */
0, /* sq_ass_item */
0, /* sq_ass_slice */
dbm_contains, /* sq_contains */
0, /* sq_inplace_concat */
0, /* sq_inplace_repeat */
};
static PyObject * static PyObject *
dbm_get(register dbmobject *dp, PyObject *args) dbm_get(register dbmobject *dp, PyObject *args)
{ {
@ -277,8 +299,6 @@ static PyMethodDef dbm_methods[] = {
"close()\nClose the database."}, "close()\nClose the database."},
{"keys", (PyCFunction)dbm_keys, METH_NOARGS, {"keys", (PyCFunction)dbm_keys, METH_NOARGS,
"keys() -> list\nReturn a list of all keys in the database."}, "keys() -> list\nReturn a list of all keys in the database."},
{"__contains__",(PyCFunction)dbm_contains, METH_VARARGS,
"__contains__(key} -> boolean\True iff key is in the database."},
{"get", (PyCFunction)dbm_get, METH_VARARGS, {"get", (PyCFunction)dbm_get, METH_VARARGS,
"get(key[, default]) -> value\n" "get(key[, default]) -> value\n"
"Return the value for key if present, otherwise default."}, "Return the value for key if present, otherwise default."},
@ -308,7 +328,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*/
}; };
@ -353,7 +373,8 @@ PyMODINIT_FUNC
initdbm(void) { initdbm(void) {
PyObject *m, *d, *s; PyObject *m, *d, *s;
Dbmtype.ob_type = &PyType_Type; if (PyType_Ready(&Dbmtype) < 0)
return;
m = Py_InitModule("dbm", dbmmodule_methods); m = Py_InitModule("dbm", dbmmodule_methods);
if (m == NULL) if (m == NULL)
return; return;