Mercurial > cpython-lru_cache-weakref
diff Modules/_dbmmodule.c @ 49057:8ffec372040e
fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap,
ossaudiodev, & winreg modules to return bytes objects instead of bytearray
objects.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Sat, 06 Sep 2008 21:34:51 +0000 |
| parents | aa1fbe321acf |
| children | dfeda0d3d636 |
line wrap: on
line diff
--- a/Modules/_dbmmodule.c Sat Sep 06 21:03:22 2008 +0000 +++ b/Modules/_dbmmodule.c Sat Sep 06 21:34:51 2008 +0000 @@ -111,7 +111,7 @@ PyErr_SetString(DbmError, ""); return NULL; } - return PyByteArray_FromStringAndSize(drec.dptr, drec.dsize); + return PyBytes_FromStringAndSize(drec.dptr, drec.dsize); } static int @@ -188,7 +188,7 @@ return NULL; for (key = dbm_firstkey(dp->di_dbm); key.dptr; key = dbm_nextkey(dp->di_dbm)) { - item = PyByteArray_FromStringAndSize(key.dptr, key.dsize); + item = PyBytes_FromStringAndSize(key.dptr, key.dsize); if (item == NULL) { Py_DECREF(v); return NULL; @@ -260,7 +260,7 @@ check_dbmobject_open(dp); val = dbm_fetch(dp->di_dbm, key); if (val.dptr != NULL) - return PyByteArray_FromStringAndSize(val.dptr, val.dsize); + return PyBytes_FromStringAndSize(val.dptr, val.dsize); else { Py_INCREF(defvalue); return defvalue; @@ -283,9 +283,9 @@ check_dbmobject_open(dp); val = dbm_fetch(dp->di_dbm, key); if (val.dptr != NULL) - return PyByteArray_FromStringAndSize(val.dptr, val.dsize); + return PyBytes_FromStringAndSize(val.dptr, val.dsize); if (defvalue == NULL) { - defvalue = PyByteArray_FromStringAndSize(NULL, 0); + defvalue = PyBytes_FromStringAndSize(NULL, 0); if (defvalue == NULL) return NULL; val.dptr = NULL;