diff options
| author | Xiang Zhang <angwerzx@126.com> | 2018-12-12 20:46:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 20:46:55 +0800 |
| commit | 4fb0b8bc25c52aae8dcb4353e69c1c88999a9a53 (patch) | |
| tree | aa3b18ad394fbd5056af5a366e2b4ca6b91d5296 /Modules | |
| parent | 5a718e918db6211b633a7afb2bf537eb5b56cb1b (diff) | |
| download | cpython-git-4fb0b8bc25c52aae8dcb4353e69c1c88999a9a53.tar.gz | |
bpo-33106: change dbm key deletion error for readonly file from KeyError to dbm.error (#6295)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_dbmmodule.c | 15 | ||||
| -rw-r--r-- | Modules/_gdbmmodule.c | 9 |
2 files changed, 19 insertions, 5 deletions
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 081184a0b3..21784ae2ce 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -36,6 +36,7 @@ class _dbm.dbm "dbmobject *" "&Dbmtype" typedef struct { PyObject_HEAD + int flags; int di_size; /* -1 means recompute */ DBM *di_dbm; } dbmobject; @@ -60,6 +61,7 @@ newdbmobject(const char *file, int flags, int mode) 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 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w) 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 @@ _dbm_dbm_setdefault_impl(dbmobject *self, const char *key, 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; diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index 46bb59ac95..cc94e60745 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -186,14 +186,19 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w) dp->di_size = -1; if (w == NULL) { if (gdbm_delete(dp->di_dbm, krec) < 0) { - PyErr_SetObject(PyExc_KeyError, v); + if (gdbm_errno == GDBM_ITEM_NOT_FOUND) { + PyErr_SetObject(PyExc_KeyError, v); + } + else { + PyErr_SetString(DbmError, gdbm_strerror(gdbm_errno)); + } return -1; } } else { if (!PyArg_Parse(w, "s#", &drec.dptr, &drec.dsize)) { PyErr_SetString(PyExc_TypeError, - "gdbm mappings have byte or string elements only"); + "gdbm mappings have bytes or string elements only"); return -1; } errno = 0; |