Skip to content

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

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

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 Victor's review
  • Loading branch information
@corona10
corona10 committed Jun 15, 2020
commit 4a69834d9e391b55f711323b9154e8c24948cf28
54 changes: 23 additions & 31 deletions Modules/_dbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ dbm_length(dbmobject *dp)
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
assert(state != NULL);
if (state == NULL) {
return -1;
}
if (dp->di_dbm == NULL) {
PyErr_SetString(state->dbm_error, "DBM object has already been closed");
return -1;
Expand All @@ -125,11 +122,10 @@ dbm_subscript(dbmobject *dp, PyObject *key)
Py_ssize_t tmp_size;
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
if (state == NULL) {
assert(state != NULL);
if (!PyArg_Parse(key, "s#", &krec.dptr, &tmp_size)) {
return NULL;
}
if (!PyArg_Parse(key, "s#", &krec.dptr, &tmp_size) )
return NULL;

krec.dsize = tmp_size;
check_dbmobject_open(dp, state->dbm_error);
Expand Down Expand Up @@ -159,9 +155,7 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
}
PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
if (state == NULL) {
return -1;
}
assert(state != NULL);
krec.dsize = tmp_size;
if (dp->di_dbm == NULL) {
PyErr_SetString(state->dbm_error, "DBM object has already been closed");
Expand Down Expand Up @@ -237,9 +231,7 @@ _dbm_dbm_keys_impl(dbmobject *self, PyTypeObject *cls)
int err;

_dbm_state *state = PyType_GetModuleState(cls);
if (state == NULL) {
return NULL;
}
assert(state != NULL);
check_dbmobject_open(self, state->dbm_error);
v = PyList_New(0);
if (v == NULL) {
Expand Down Expand Up @@ -271,9 +263,7 @@ dbm_contains(PyObject *self, PyObject *arg)

PyTypeObject *tp = Py_TYPE(dp);
_dbm_state *state = PyType_GetModuleState(tp);
if (state == NULL) {
return -1;
}
assert(state != NULL);
if ((dp)->di_dbm == NULL) {
PyErr_SetString(state->dbm_error,
"DBM object has already been closed");
Expand Down Expand Up @@ -316,15 +306,14 @@ _dbm_dbm_get_impl(dbmobject *self, PyTypeObject *cls, const char *key,
{
datum dbm_key, val;
_dbm_state *state = PyType_GetModuleState(cls);
if (state == NULL) {
return NULL;
}
assert(state != NULL);
dbm_key.dptr = (char *)key;
dbm_key.dsize = key_length;
check_dbmobject_open(self, state->dbm_error);
val = dbm_fetch(self->di_dbm, dbm_key);
if (val.dptr != NULL)
if (val.dptr != NULL) {
return PyBytes_FromStringAndSize(val.dptr, val.dsize);
}

Py_INCREF(default_value);
return default_value;
Expand All @@ -351,15 +340,14 @@ _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);
if (state == NULL) {
return NULL;
}
assert(state != NULL);
dbm_key.dptr = (char *)key;
dbm_key.dsize = key_length;
check_dbmobject_open(self, state->dbm_error);
val = dbm_fetch(self->di_dbm, dbm_key);
if (val.dptr != NULL)
if (val.dptr != NULL) {
return PyBytes_FromStringAndSize(val.dptr, val.dsize);
}
if (default_value == NULL) {
default_value = PyBytes_FromStringAndSize(NULL, 0);
if (default_value == NULL) {
Expand Down Expand Up @@ -461,19 +449,23 @@ dbmopen_impl(PyObject *module, PyObject *filename, const char *flags,
{
int iflags;
_dbm_state *state = get_dbm_state(module);
if (state == NULL) {
return NULL;
}
if ( strcmp(flags, "r") == 0 )
assert(state != NULL);
if (strcmp(flags, "r") == 0) {
iflags = O_RDONLY;
else if ( strcmp(flags, "w") == 0 )
}
else if (strcmp(flags, "w") == 0) {
iflags = O_RDWR;
else if ( strcmp(flags, "rw") == 0 ) /* B/W compat */
}
else if (strcmp(flags, "rw") == 0) {
/* B/W compat */
iflags = O_RDWR|O_CREAT;
else if ( strcmp(flags, "c") == 0 )
}
else if (strcmp(flags, "c") == 0) {
iflags = O_RDWR|O_CREAT;
else if ( strcmp(flags, "n") == 0 )
}
else if (strcmp(flags, "n") == 0) {
iflags = O_RDWR|O_CREAT|O_TRUNC;
}
else {
PyErr_SetString(state->dbm_error,
"arg 2 to open should be 'r', 'w', 'c', or 'n'");
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy