bpo-33106: change dbm key deletion error for readonly file from KeyError to dbm.error (#6295)
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index 081184a..21784ae 100644
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -36,6 +36,7 @@
typedef struct {
PyObject_HEAD
+ int flags;
int di_size; /* -1 means recompute */
DBM *di_dbm;
} dbmobject;
@@ -60,6 +61,7 @@
if (dp == NULL)
return NULL;
dp->di_size = -1;
+ dp->flags = flags;
/* See issue #19296 */
if ( (dp->di_dbm = dbm_open((char *)file, flags, mode)) == 0 ) {
PyErr_SetFromErrnoWithFilename(DbmError, file);
@@ -143,13 +145,20 @@
if (w == NULL) {
if ( dbm_delete(dp->di_dbm, krec) < 0 ) {
dbm_clearerr(dp->di_dbm);
- PyErr_SetObject(PyExc_KeyError, v);
+ /* we might get a failure for reasons like file corrupted,
+ but we are not able to distinguish it */
+ if (dp->flags & O_RDWR) {
+ PyErr_SetObject(PyExc_KeyError, v);
+ }
+ else {
+ PyErr_SetString(DbmError, "cannot delete item from database");
+ }
return -1;
}
} else {
if ( !PyArg_Parse(w, "s#", &drec.dptr, &tmp_size) ) {
PyErr_SetString(PyExc_TypeError,
- "dbm mappings have byte or string elements only");
+ "dbm mappings have bytes or string elements only");
return -1;
}
drec.dsize = tmp_size;
@@ -335,7 +344,7 @@
else {
if ( !PyArg_Parse(default_value, "s#", &val.dptr, &tmp_size) ) {
PyErr_SetString(PyExc_TypeError,
- "dbm mappings have byte string elements only");
+ "dbm mappings have bytes or string elements only");
return NULL;
}
val.dsize = tmp_size;