Skip to content

Commit 44b83ad

Browse files
committed
bpo-46541: Address code review
1 parent c9139d7 commit 44b83ad

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

Modules/_dbmmodule.c

+1-12
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
typedef struct {
3838
PyTypeObject *dbm_type;
3939
PyObject *dbm_error;
40-
PyObject *str_close;
4140
} _dbm_state;
4241

4342
static inline _dbm_state*
@@ -396,9 +395,7 @@ dbm__enter__(PyObject *self, PyObject *args)
396395
static PyObject *
397396
dbm__exit__(PyObject *self, PyObject *args)
398397
{
399-
_dbm_state *state = PyType_GetModuleState(Py_TYPE(self));
400-
assert(state != NULL);
401-
return PyObject_CallMethodNoArgs(self, state->str_close);
398+
return _dbm_dbm_close_impl((dbmobject *)self);
402399
}
403400

404401
static PyMethodDef dbm_methods[] = {
@@ -527,12 +524,6 @@ _dbm_exec(PyObject *module)
527524
if (PyModule_AddType(module, (PyTypeObject *)state->dbm_error) < 0) {
528525
return -1;
529526
}
530-
531-
PyObject *str_close = PyUnicode_InternFromString("close");
532-
if (str_close == NULL) {
533-
return -1;
534-
}
535-
state->str_close = str_close;
536527
return 0;
537528
}
538529

@@ -542,7 +533,6 @@ _dbm_module_traverse(PyObject *module, visitproc visit, void *arg)
542533
_dbm_state *state = get_dbm_state(module);
543534
Py_VISIT(state->dbm_error);
544535
Py_VISIT(state->dbm_type);
545-
Py_VISIT(state->str_close);
546536
return 0;
547537
}
548538

@@ -552,7 +542,6 @@ _dbm_module_clear(PyObject *module)
552542
_dbm_state *state = get_dbm_state(module);
553543
Py_CLEAR(state->dbm_error);
554544
Py_CLEAR(state->dbm_type);
555-
Py_CLEAR(state->str_close);
556545
return 0;
557546
}
558547

Modules/_gdbmmodule.c

+1-11
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ extern const char * gdbm_strerror(gdbm_error);
2020
typedef struct {
2121
PyTypeObject *gdbm_type;
2222
PyObject *gdbm_error;
23-
PyObject *str_close;
2423
} _gdbm_state;
2524

2625
static inline _gdbm_state*
@@ -545,9 +544,7 @@ gdbm__enter__(PyObject *self, PyObject *args)
545544
static PyObject *
546545
gdbm__exit__(PyObject *self, PyObject *args)
547546
{
548-
_gdbm_state *state = PyType_GetModuleState(Py_TYPE(self));
549-
assert(state != NULL);
550-
return PyObject_CallMethodNoArgs(self, state->str_close);
547+
return _gdbm_gdbm_close_impl((gdbmobject *)self);
551548
}
552549

553550
static PyMethodDef gdbm_methods[] = {
@@ -741,11 +738,6 @@ _gdbm_exec(PyObject *module)
741738
return -1;
742739
}
743740
#endif
744-
PyObject *str_close = PyUnicode_InternFromString("close");
745-
if (str_close == NULL) {
746-
return -1;
747-
}
748-
state->str_close = str_close;
749741
return 0;
750742
}
751743

@@ -755,7 +747,6 @@ _gdbm_module_traverse(PyObject *module, visitproc visit, void *arg)
755747
_gdbm_state *state = get_gdbm_state(module);
756748
Py_VISIT(state->gdbm_error);
757749
Py_VISIT(state->gdbm_type);
758-
Py_VISIT(state->str_close);
759750
return 0;
760751
}
761752

@@ -765,7 +756,6 @@ _gdbm_module_clear(PyObject *module)
765756
_gdbm_state *state = get_gdbm_state(module);
766757
Py_CLEAR(state->gdbm_error);
767758
Py_CLEAR(state->gdbm_type);
768-
Py_CLEAR(state->str_close);
769759
return 0;
770760
}
771761

0 commit comments

Comments
 (0)