Skip to content

bpo-40077: Convert _csv module to use PyType_FromSpec #20974

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

Closed
corona10 wants to merge 7 commits into from
Closed

bpo-40077: Convert _csv module to use PyType_FromSpec #20974

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f80d4c6
bpo-40077: Convert _csv module to use PyType_FromSpec
corona10 Jun 3, 2020
53df5eb
bpo-40077: Add NEWS.d
corona10 Jun 19, 2020
dbc4d32
bpo-40077: Update
corona10 Jun 19, 2020
9f1266b
bpo-40077: PEP7
corona10 Jun 19, 2020
85d36e9
bpo-40077: Update
corona10 Jun 19, 2020
10114f0
bpo-40077: Update
corona10 Jun 19, 2020
14c6de7
bpo-40077: Apply Victor's suggestion
corona10 Jun 19, 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-40077: Update
  • Loading branch information
@corona10
corona10 committed Jun 19, 2020
commit 85d36e9a066ee22c86cf715a4fb15c1d32e66220
11 changes: 5 additions & 6 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ _csv_clear(PyObject *m)
static int
_csv_traverse(PyObject *m, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(m));
_csvstate *state = get_csv_state(m);
Py_VISIT(state->error_obj);
Py_VISIT(state->dialects);
Expand All @@ -63,10 +62,10 @@ _csv_free(void *m)
_csv_clear((PyObject *)m);
}

PyDoc_STRVAR(unused_reduce_doc, "__reduce__() -> (cls, state)");
PyDoc_STRVAR(reduce_always_fail_doc, "__reduce__() -> (cls, state)");

static PyObject *
unused_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
reduce_always_fail(PyObject *self, PyObject *Py_UNUSED(ignored))
{
PyErr_Format(PyExc_TypeError,
"cannot pickle %s object",
Expand Down Expand Up @@ -488,7 +487,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
}

static struct PyMethodDef Dialect_methods[] = {
{ "__reduce__", (PyCFunction)unused_reduce, METH_NOARGS, unused_reduce_doc},
{ "__reduce__", (PyCFunction)reduce_always_fail, METH_NOARGS, reduce_always_fail_doc},
{ NULL, NULL }
};

Expand Down Expand Up @@ -932,7 +931,7 @@ PyDoc_STRVAR(Reader_Type_doc,
);

static struct PyMethodDef Reader_methods[] = {
{ "__reduce__", (PyCFunction)unused_reduce, METH_NOARGS, unused_reduce_doc},
{ "__reduce__", (PyCFunction)reduce_always_fail, METH_NOARGS, reduce_always_fail_doc},
{ NULL, NULL }
};
#define R_OFF(x) offsetof(ReaderObj, x)
Expand Down Expand Up @@ -1324,7 +1323,7 @@ csv_writerows(WriterObj *self, PyObject *seqseq)
static struct PyMethodDef Writer_methods[] = {
{ "writerow", (PyCFunction)csv_writerow, METH_O, csv_writerow_doc},
{ "writerows", (PyCFunction)csv_writerows, METH_O, csv_writerows_doc},
{ "__reduce__", (PyCFunction)unused_reduce, METH_NOARGS, unused_reduce_doc},
{ "__reduce__", (PyCFunction)reduce_always_fail, METH_NOARGS, reduce_always_fail_doc},
{ NULL, NULL }
};

Expand Down