Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-1635741: Port _dbm module to multiphase initialization #20848

Merged
merged 9 commits into from
Jun 15, 2020
Merged

bpo-1635741: Port _dbm module to multiphase initialization #20848

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7736a6b
bpo-1635741: Port _dbm module to multiphase initialization
corona10 Jun 12, 2020
ce98ee9
bpo-1635741: Apply PEP 7
corona10 Jun 13, 2020
f0371c6
bpo-1635741: Apply PEP 7
corona10 Jun 13, 2020
7ec3d5c
bpo-1635741: Apply Victor's review
corona10 Jun 15, 2020
4a69834
bpo-1635741: Apply Victor's review
corona10 Jun 15, 2020
87a6ef1
bpo-1635741: reformat macro
corona10 Jun 15, 2020
b325856
Update Modules/_dbmmodule.c
corona10 Jun 15, 2020
46d7c69
bpo-1635741: Apply code review
corona10 Jun 15, 2020
ae11a49
bpo-1635741: Update
corona10 Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bpo-1635741: Apply code review
  • Loading branch information
@corona10
corona10 committed Jun 15, 2020
commit 46d7c6903c15bc83807acec7c3f06acff3114d3a
16 changes: 6 additions & 10 deletions Modules/_dbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ dbm_dealloc(dbmobject *dp)
static Py_ssize_t
dbm_length(dbmobject *dp)
{
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
_dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
assert(state != NULL);
if (dp->di_dbm == NULL) {
PyErr_SetString(state->dbm_error, "DBM object has already been closed");
Expand All @@ -122,8 +121,7 @@ dbm_subscript(dbmobject *dp, PyObject *key)
{
datum drec, krec;
Py_ssize_t tmp_size;
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
_dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
assert(state != NULL);
if (!PyArg_Parse(key, "s#", &krec.dptr, &tmp_size)) {
return NULL;
Expand Down Expand Up @@ -155,8 +153,7 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
"dbm mappings have bytes or string keys only");
return -1;
}
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
_dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
assert(state != NULL);
krec.dsize = tmp_size;
if (dp->di_dbm == NULL) {
Expand Down Expand Up @@ -263,8 +260,7 @@ dbm_contains(PyObject *self, PyObject *arg)
datum key, val;
Py_ssize_t size;

PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
_dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
assert(state != NULL);
if ((dp)->di_dbm == NULL) {
PyErr_SetString(state->dbm_error,
Expand Down Expand Up @@ -307,7 +303,7 @@ _dbm_dbm_get_impl(dbmobject *self, PyTypeObject *cls, const char *key,
/*[clinic end generated code: output=34851b5dc1c664dc input=66b993b8349fa8c1]*/
{
datum dbm_key, val;
_dbm_state *state = PyType_GetModuleState(cls);
_dbm_state *state = PyType_GetModuleState(cls);
assert(state != NULL);
dbm_key.dptr = (char *)key;
dbm_key.dsize = key_length;
Expand Down Expand Up @@ -341,7 +337,7 @@ _dbm_dbm_setdefault_impl(dbmobject *self, PyTypeObject *cls, const char *key,
{
datum dbm_key, val;
Py_ssize_t tmp_size;
_dbm_state *state = PyType_GetModuleState(cls);
_dbm_state *state = PyType_GetModuleState(cls);
assert(state != NULL);
dbm_key.dptr = (char *)key;
dbm_key.dsize = key_length;
Expand Down