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

The dbm module should use bytes for keys. This makes test_shelve pass.

Browse source
This commit is contained in:
Guido van Rossum 2007-08-14 15:42:45 +00:00
parent 5bcf109c73
commit 956e359579
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_dbm.py
View file

@ -26,10 +26,10 @@ def cleanup():
def test_keys(): def test_keys():
d = dbm.open(filename, 'c') d = dbm.open(filename, 'c')
verify(d.keys() == []) verify(d.keys() == [])
d['a'] = 'b' d[b'a'] = b'b'
d['12345678910'] = '019237410982340912840198242' d[b'12345678910'] = b'019237410982340912840198242'
d.keys() d.keys()
if 'a' in d: if b'a' in d:
if verbose: if verbose:
print('Test dbm keys: ', d.keys()) print('Test dbm keys: ', d.keys())

10
Modules/dbmmodule.c
View file

@ -188,7 +188,7 @@ dbm_keys(register dbmobject *dp, PyObject *unused)
return NULL; return NULL;
for (key = dbm_firstkey(dp->di_dbm); key.dptr; for (key = dbm_firstkey(dp->di_dbm); key.dptr;
key = dbm_nextkey(dp->di_dbm)) { key = dbm_nextkey(dp->di_dbm)) {
item = PyString_FromStringAndSize(key.dptr, key.dsize); item = PyBytes_FromStringAndSize(key.dptr, key.dsize);
if (item == NULL) { if (item == NULL) {
Py_DECREF(v); Py_DECREF(v);
return NULL; return NULL;
@ -219,14 +219,14 @@ dbm_contains(PyObject *self, PyObject *arg)
if (arg == NULL) if (arg == NULL)
return -1; return -1;
} }
if (!PyString_Check(arg)) { if (!PyBytes_Check(arg)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"dbm key must be string, not %.100s", "dbm key must be string, not %.100s",
arg->ob_type->tp_name); arg->ob_type->tp_name);
return -1; return -1;
} }
key.dptr = PyString_AS_STRING(arg); key.dptr = PyBytes_AS_STRING(arg);
key.dsize = PyString_GET_SIZE(arg); key.dsize = PyBytes_GET_SIZE(arg);
val = dbm_fetch(dp->di_dbm, key); val = dbm_fetch(dp->di_dbm, key);
return val.dptr != NULL; return val.dptr != NULL;
} }
@ -395,7 +395,7 @@ initdbm(void) {
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
if (DbmError == NULL) if (DbmError == NULL)
DbmError = PyErr_NewException("dbm.error", NULL, NULL); DbmError = PyErr_NewException("dbm.error", NULL, NULL);
s = PyString_FromString(which_dbm); s = PyUnicode_FromString(which_dbm);
if (s != NULL) { if (s != NULL) {
PyDict_SetItemString(d, "library", s); PyDict_SetItemString(d, "library", s);
Py_DECREF(s); Py_DECREF(s);