Skip to content

bpo-14935: Remove static state from the _csv module #23224

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
encukou merged 12 commits into from
Dec 15, 2020
Merged

bpo-14935: Remove static state from the _csv module #23224

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a2a0e6f
Remove static state from the _csv module
encukou May 12, 2020
09802b2
Use PyModule_AddObjectRef and PyTuple_Pack
encukou Nov 10, 2020
1665ac7
Rename m_state to module_state
encukou Nov 13, 2020
23f844a
Use Py_CLEAR rather than Py_XDECREF
encukou Nov 13, 2020
8d1f95d
Use `module` rather than `m`
encukou Nov 13, 2020
2c60895
Factor out calling _PyType_GetModuleByDef & PyModule_GetState
encukou Nov 13, 2020
e69d0a1
Set freed pointers to NULL
encukou Nov 13, 2020
fb93e7f
Only call get_csv_state up to once per function
encukou Nov 13, 2020
b62987b
Pass module_state directly to _call_dialect
encukou Nov 13, 2020
f12a768
Add NULL check for _csv_state_from_type
encukou Dec 8, 2020
f302029
Use Py_NewRef where appropriate
encukou Dec 8, 2020
b8c37bf
Use designated initializers for spec structs
encukou Dec 8, 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
Only call get_csv_state up to once per function
  • Loading branch information
@encukou
encukou committed Nov 13, 2020
commit fb93e7fdb5dcd0f7a7b9c6087fc5110357aba66f
24 changes: 13 additions & 11 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,9 +975,10 @@ static PyObject *
csv_reader(PyObject *module, PyObject *args, PyObject *keyword_args)
{
PyObject * iterator, * dialect = NULL;
_csvstate *module_state = get_csv_state(module);
ReaderObj * self = PyObject_GC_New(
ReaderObj,
get_csv_state(module)->reader_type);
module_state->reader_type);

if (!self)
return NULL;
Expand Down Expand Up @@ -1394,9 +1395,8 @@ static PyObject *
csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
{
PyObject * output_file, * dialect = NULL;
WriterObj * self = PyObject_GC_New(
WriterObj,
get_csv_state(module)->writer_type);
_csvstate *module_state = get_csv_state(module);
WriterObj * self = PyObject_GC_New(WriterObj, module_state->writer_type);
_Py_IDENTIFIER(write);

if (!self)
Expand All @@ -1410,7 +1410,7 @@ csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
self->rec_len = 0;
self->num_fields = 0;

self->error_obj = get_csv_state(module)->error_obj;
self->error_obj = module_state->error_obj;
Py_INCREF(self->error_obj);

if (!PyArg_UnpackTuple(args, "", 1, 2, &output_file, &dialect)) {
Expand Down Expand Up @@ -1474,9 +1474,10 @@ csv_register_dialect(PyObject *module, PyObject *args, PyObject *kwargs)
static PyObject *
csv_unregister_dialect(PyObject *module, PyObject *name_obj)
{
Comment thread
encukou marked this conversation as resolved.
if (PyDict_DelItem(get_csv_state(module)->dialects, name_obj) < 0) {
_csvstate *module_state = get_csv_state(module);
if (PyDict_DelItem(module_state->dialects, name_obj) < 0) {
if (PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_Format(get_csv_state(module)->error_obj, "unknown dialect");
PyErr_Format(module_state->error_obj, "unknown dialect");
}
return NULL;
}
Expand All @@ -1493,7 +1494,8 @@ static PyObject *
csv_field_size_limit(PyObject *module, PyObject *args)
{
PyObject *new_limit = NULL;
long old_limit = get_csv_state(module)->field_limit;
_csvstate *module_state = get_csv_state(module);
long old_limit = module_state->field_limit;

if (!PyArg_UnpackTuple(args, "field_size_limit", 0, 1, &new_limit))
return NULL;
Expand All @@ -1503,9 +1505,9 @@ csv_field_size_limit(PyObject *module, PyObject *args)
"limit must be an integer");
return NULL;
}
get_csv_state(module)->field_limit = PyLong_AsLong(new_limit);
if (get_csv_state(module)->field_limit == -1 && PyErr_Occurred()) {
get_csv_state(module)->field_limit = old_limit;
module_state->field_limit = PyLong_AsLong(new_limit);
if (module_state->field_limit == -1 && PyErr_Occurred()) {
module_state->field_limit = old_limit;
return NULL;
}
}
Expand Down