Skip to content

bpo-46541: Remove usage of _Py_IDENTIFIER from dbms modules #31358

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 3 commits into from
Feb 16, 2022
Merged

bpo-46541: Remove usage of _Py_IDENTIFIER from dbms modules #31358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38fa7c5
bpo-46541: Remove usage of _Py_IDENTIFIER from dbms modules
corona10 Feb 15, 2022
c9139d7
bpo-46541: nit
corona10 Feb 16, 2022
44b83ad
bpo-46541: Address code review
corona10 Feb 16, 2022
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
15 changes: 12 additions & 3 deletions Modules/_dbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@


#define PY_SSIZE_T_CLEAN
#define NEEDS_PY_IDENTIFIER
#include "Python.h"

#include <sys/types.h>
Expand Down Expand Up @@ -38,6 +37,7 @@
typedef struct {
PyTypeObject *dbm_type;
PyObject *dbm_error;
PyObject *str_close;
} _dbm_state;

static inline _dbm_state*
Expand Down Expand Up @@ -396,8 +396,9 @@ dbm__enter__(PyObject *self, PyObject *args)
static PyObject *
dbm__exit__(PyObject *self, PyObject *args)
{
_Py_IDENTIFIER(close);
return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
_dbm_state *state = PyType_GetModuleState(Py_TYPE(self));
assert(state != NULL);
return PyObject_CallMethodNoArgs(self, state->str_close);
}

static PyMethodDef dbm_methods[] = {
Expand Down Expand Up @@ -526,6 +527,12 @@ _dbm_exec(PyObject *module)
if (PyModule_AddType(module, (PyTypeObject *)state->dbm_error) < 0) {
return -1;
}

PyObject *str_close = PyUnicode_InternFromString("close");
if (str_close == NULL) {
return -1;
}
state->str_close = str_close;
return 0;
}

Expand All @@ -535,6 +542,7 @@ _dbm_module_traverse(PyObject *module, visitproc visit, void *arg)
_dbm_state *state = get_dbm_state(module);
Py_VISIT(state->dbm_error);
Py_VISIT(state->dbm_type);
Py_VISIT(state->str_close);
return 0;
}

Expand All @@ -544,6 +552,7 @@ _dbm_module_clear(PyObject *module)
_dbm_state *state = get_dbm_state(module);
Py_CLEAR(state->dbm_error);
Py_CLEAR(state->dbm_type);
Py_CLEAR(state->str_close);
return 0;
}

Expand Down
14 changes: 11 additions & 3 deletions Modules/_gdbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/* Doc strings: Mitch Chapman */

#define PY_SSIZE_T_CLEAN
#define NEEDS_PY_IDENTIFIER
#include "Python.h"
#include "gdbm.h"

Expand All @@ -21,6 +20,7 @@ extern const char * gdbm_strerror(gdbm_error);
typedef struct {
PyTypeObject *gdbm_type;
PyObject *gdbm_error;
PyObject *str_close;
} _gdbm_state;

static inline _gdbm_state*
Expand Down Expand Up @@ -545,8 +545,9 @@ gdbm__enter__(PyObject *self, PyObject *args)
static PyObject *
gdbm__exit__(PyObject *self, PyObject *args)
{
_Py_IDENTIFIER(close);
return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
_gdbm_state *state = PyType_GetModuleState(Py_TYPE(self));
assert(state != NULL);
return PyObject_CallMethodNoArgs(self, state->str_close);
}

static PyMethodDef gdbm_methods[] = {
Expand Down Expand Up @@ -740,6 +741,11 @@ _gdbm_exec(PyObject *module)
return -1;
}
#endif
PyObject *str_close = PyUnicode_InternFromString("close");
if (str_close == NULL) {
return -1;
}
state->str_close = str_close;
return 0;
}

Expand All @@ -749,6 +755,7 @@ _gdbm_module_traverse(PyObject *module, visitproc visit, void *arg)
_gdbm_state *state = get_gdbm_state(module);
Py_VISIT(state->gdbm_error);
Py_VISIT(state->gdbm_type);
Py_VISIT(state->str_close);
return 0;
}

Expand All @@ -758,6 +765,7 @@ _gdbm_module_clear(PyObject *module)
_gdbm_state *state = get_gdbm_state(module);
Py_CLEAR(state->gdbm_error);
Py_CLEAR(state->gdbm_type);
Py_CLEAR(state->str_close);
return 0;
}

Expand Down