Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ef671116
Commit
ef671116
authored
Aug 19, 2006
by
Guido van Rossum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix this right for has_key(). This required adding tp_as_sequence.
parent
e014a13f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
13 deletions
+34
-13
Modules/dbmmodule.c
Modules/dbmmodule.c
+34
-13
No files found.
Modules/dbmmodule.c
View file @
ef671116
...
...
@@ -205,20 +205,42 @@ dbm_keys(register dbmobject *dp, PyObject *unused)
return
v
;
}
static
PyObject
*
dbm_contains
(
register
dbmobject
*
dp
,
PyObject
*
args
)
static
int
dbm_contains
(
PyObject
*
self
,
PyObject
*
arg
)
{
dbmobject
*
dp
=
(
dbmobject
*
)
self
;
datum
key
,
val
;
int
tmp_size
;
if
(
!
PyArg_ParseTuple
(
args
,
"s#:__contains__"
,
&
key
.
dptr
,
&
tmp_size
))
return
NULL
;
key
.
dsize
=
tmp_size
;
check_dbmobject_open
(
dp
);
if
((
dp
)
->
di_dbm
==
NULL
)
{
PyErr_SetString
(
DbmError
,
"DBM object has already been closed"
);
return
-
1
;
}
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
);
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
*
dbm_get
(
register
dbmobject
*
dp
,
PyObject
*
args
)
{
...
...
@@ -277,8 +299,6 @@ static PyMethodDef dbm_methods[] = {
"close()
\n
Close the database."
},
{
"keys"
,
(
PyCFunction
)
dbm_keys
,
METH_NOARGS
,
"keys() -> list
\n
Return 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(key[, default]) -> value
\n
"
"Return the value for key if present, otherwise default."
},
...
...
@@ -308,7 +328,7 @@ static PyTypeObject Dbmtype = {
0
,
/*tp_compare*/
0
,
/*tp_repr*/
0
,
/*tp_as_number*/
0
,
/*tp_as_sequence*/
&
dbm_as_sequence
,
/*tp_as_sequence*/
&
dbm_as_mapping
,
/*tp_as_mapping*/
};
...
...
@@ -353,7 +373,8 @@ PyMODINIT_FUNC
initdbm
(
void
)
{
PyObject
*
m
,
*
d
,
*
s
;
Dbmtype
.
ob_type
=
&
PyType_Type
;
if
(
PyType_Ready
(
&
Dbmtype
)
<
0
)
return
;
m
=
Py_InitModule
(
"dbm"
,
dbmmodule_methods
);
if
(
m
==
NULL
)
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment