diff options
author | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:09:03 +0100 |
---|---|---|
committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-02-09 16:09:03 +0100 |
commit | 2a1d833d5da7fa7a01a2eef183b0a208ed019427 (patch) | |
tree | 8da3ebb695ae55c69d0a58691403fb13d96a9476 /Modules/_gdbmmodule.c | |
parent | c6180bb73c8c7c7f9d8ea9816487b710597b6fc1 (diff) | |
parent | bbd3587a29510bd5a318e0a19fc8570c0cd3b622 (diff) | |
download | cpython-2a1d833d5da7fa7a01a2eef183b0a208ed019427.tar.gz |
Merge issue #26355 fix from 3.6
Diffstat (limited to 'Modules/_gdbmmodule.c')
-rw-r--r-- | Modules/_gdbmmodule.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index daae71dc8d..54a6566422 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -255,8 +255,7 @@ _gdbm_gdbm_close_impl(dbmobject *self) if (self->di_dbm) gdbm_close(self->di_dbm); self->di_dbm = NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } /* XXX Should return a set or a set view */ @@ -319,7 +318,7 @@ dbm_contains(PyObject *self, PyObject *arg) return -1; } if (PyUnicode_Check(arg)) { - key.dptr = PyUnicode_AsUTF8AndSize(arg, &size); + key.dptr = (char *)PyUnicode_AsUTF8AndSize(arg, &size); key.dsize = size; if (key.dptr == NULL) return -1; @@ -375,8 +374,7 @@ _gdbm_gdbm_firstkey_impl(dbmobject *self) return v; } else { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -415,8 +413,7 @@ _gdbm_gdbm_nextkey_impl(dbmobject *self, const char *key, return v; } else { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } } @@ -445,8 +442,7 @@ _gdbm_gdbm_reorganize_impl(dbmobject *self) PyErr_SetString(DbmError, gdbm_strerror(gdbm_errno)); return NULL; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } /*[clinic input] @@ -464,8 +460,7 @@ _gdbm_gdbm_sync_impl(dbmobject *self) { check_dbmobject_open(self); gdbm_sync(self->di_dbm); - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * |