diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index 875a600f79565a..0db53c312f07b7 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -296,6 +296,8 @@ PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
+struct PyModuleDef;
+PyAPI_FUNC(PyObject *) _PyType_GetModuleByDef(PyTypeObject *, struct PyModuleDef *);
struct _Py_Identifier;
PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
diff --git a/Misc/NEWS.d/next/Library/2020-10-20-23-28-55.bpo-1635741.Iyka3r.rst b/Misc/NEWS.d/next/Library/2020-10-20-23-28-55.bpo-1635741.Iyka3r.rst
new file mode 100644
index 00000000000000..e14e9a12c275dd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-10-20-23-28-55.bpo-1635741.Iyka3r.rst
@@ -0,0 +1 @@
+Port the _csv module to the multi-phase initialization API (:pep:`489`).
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 594f6c14727262..e1a6a22e1269f1 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -18,9 +18,14 @@ module instead.
typedef struct {
PyObject *error_obj; /* CSV exception */
PyObject *dialects; /* Dialect registry */
+ PyTypeObject *dialect_type;
+ PyTypeObject *reader_type;
+ PyTypeObject *writer_type;
long field_limit; /* max parsed field size */
} _csvstate;
+static struct PyModuleDef _csvmodule;
+
static inline _csvstate*
get_csv_state(PyObject *module)
{
@@ -32,16 +37,24 @@ get_csv_state(PyObject *module)
static int
_csv_clear(PyObject *m)
{
- Py_CLEAR(get_csv_state(m)->error_obj);
- Py_CLEAR(get_csv_state(m)->dialects);
+ _csvstate *m_state = PyModule_GetState(m);
+ Py_CLEAR(m_state->error_obj);
+ Py_CLEAR(m_state->dialects);
+ Py_CLEAR(m_state->dialect_type);
+ Py_CLEAR(m_state->reader_type);
+ Py_CLEAR(m_state->writer_type);
return 0;
}
static int
_csv_traverse(PyObject *m, visitproc visit, void *arg)
{
- Py_VISIT(get_csv_state(m)->error_obj);
- Py_VISIT(get_csv_state(m)->dialects);
+ _csvstate *m_state = PyModule_GetState(m);
+ Py_VISIT(m_state->error_obj);
+ Py_VISIT(m_state->dialects);
+ Py_VISIT(m_state->dialect_type);
+ Py_VISIT(m_state->reader_type);
+ Py_VISIT(m_state->writer_type);
return 0;
}
@@ -51,10 +64,6 @@ _csv_free(void *m)
_csv_clear((PyObject *)m);
}
-static struct PyModuleDef _csvmodule;
-
-#define _csvstate_global ((_csvstate *)PyModule_GetState(PyState_FindModule(&_csvmodule)))
-
typedef enum {
START_RECORD, START_FIELD, ESCAPED_CHAR, IN_FIELD,
IN_QUOTED_FIELD, ESCAPE_IN_QUOTED_FIELD, QUOTE_IN_QUOTED_FIELD,
@@ -92,8 +101,6 @@ typedef struct {
} DialectObj;
-static PyTypeObject Dialect_Type;
-
typedef struct {
PyObject_HEAD
@@ -110,8 +117,6 @@ typedef struct {
unsigned long line_num; /* Source-file line number */
} ReaderObj;
-static PyTypeObject Reader_Type;
-
typedef struct {
PyObject_HEAD
@@ -123,26 +128,27 @@ typedef struct {
Py_ssize_t rec_size; /* size of allocated record */
Py_ssize_t rec_len; /* length of record */
int num_fields; /* number of fields in record */
-} WriterObj;
-static PyTypeObject Writer_Type;
+ PyObject *error_obj; /* cached error object */
+} WriterObj;
/*
* DIALECT class
*/
static PyObject *
-get_dialect_from_registry(PyObject * name_obj)
+get_dialect_from_registry(PyObject *name_obj, _csvstate *m_state)
{
PyObject *dialect_obj;
- dialect_obj = PyDict_GetItemWithError(_csvstate_global->dialects, name_obj);
+ dialect_obj = PyDict_GetItemWithError(m_state->dialects, name_obj);
if (dialect_obj == NULL) {
if (!PyErr_Occurred())
- PyErr_Format(_csvstate_global->error_obj, "unknown dialect");
+ PyErr_Format(m_state->error_obj, "unknown dialect");
}
else
Py_INCREF(dialect_obj);
+
return dialect_obj;
}
@@ -308,9 +314,17 @@ static PyGetSetDef Dialect_getsetlist[] = {
static void
Dialect_dealloc(DialectObj *self)
+{
+ PyTypeObject *tp = Py_TYPE(self);
+ Py_XDECREF(self->lineterminator);
+ tp->tp_free((PyObject *)self);
+ Py_DECREF(tp);
+}
+
+static void
+Dialect_finalize(DialectObj *self)
{
Py_XDECREF(self->lineterminator);
- Py_TYPE(self)->tp_free((PyObject *)self);
}
static char *dialect_kws[] = {
@@ -354,16 +368,27 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
&strict))
return NULL;
+ PyObject *m = _PyType_GetModuleByDef(type, &_csvmodule);
+ if (m == NULL) {
+ return NULL;
+ }
+ _csvstate *m_state = PyModule_GetState(m);
+ if (m_state == NULL) {
+ return PyErr_Format(PyExc_SystemError,
+ "dialect_new: No _csv module state found");
+ }
+
+
if (dialect != NULL) {
if (PyUnicode_Check(dialect)) {
- dialect = get_dialect_from_registry(dialect);
+ dialect = get_dialect_from_registry(dialect, m_state);
if (dialect == NULL)
return NULL;
}
else
Py_INCREF(dialect);
/* Can we reuse this instance? */
- if (PyObject_TypeCheck(dialect, &Dialect_Type) &&
+ if (PyObject_TypeCheck(dialect, m_state->dialect_type) &&
delimiter == NULL &&
doublequote == NULL &&
escapechar == NULL &&
@@ -454,63 +479,62 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
return ret;
}
+/* Since dialect is now a heap type, it inherits pickling method for
+ * protocol 0 and 1 from object, therefore it needs to be overriden */
+
+PyDoc_STRVAR(dialect_reduce_doc, "raises an exception to avoid pickling");
+
+static PyObject *
+Dialect_reduce(PyObject *self, PyObject *args) {
+ PyErr_Format(PyExc_TypeError,
+ "cannot pickle '%.100s' instances", _PyType_Name(Py_TYPE(self)));
+ return NULL;
+}
+
+static struct PyMethodDef dialect_methods[] = {
+ {"__reduce__", Dialect_reduce, METH_VARARGS, dialect_reduce_doc},
+ {"__reduce_ex__", Dialect_reduce, METH_VARARGS, dialect_reduce_doc},
+ {NULL, NULL}
+};
PyDoc_STRVAR(Dialect_Type_doc,
"CSV dialect\n"
"\n"
"The Dialect type records CSV parsing and generation options.\n");
-static PyTypeObject Dialect_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "_csv.Dialect", /* tp_name */
- sizeof(DialectObj), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)Dialect_dealloc, /* tp_dealloc */
- 0, /* tp_vectorcall_offset */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- 0, /* tp_as_async */
- (reprfunc)0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
+static PyType_Slot Dialect_Type_slots[] = {
+ {Py_tp_doc, (char*)Dialect_Type_doc},
+ {Py_tp_members, Dialect_memberlist},
+ {Py_tp_getset, Dialect_getsetlist},
+ {Py_tp_new, dialect_new},
+ {Py_tp_methods, dialect_methods},
+ {Py_tp_finalize, Dialect_finalize},
+ {Py_tp_dealloc, Dialect_dealloc},
+ {0, NULL}
+};
+
+PyType_Spec Dialect_Type_spec = {
+ "_csv.Dialect",
+ sizeof(DialectObj),
+ 0,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- Dialect_Type_doc, /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- 0, /* tp_methods */
- Dialect_memberlist, /* tp_members */
- Dialect_getsetlist, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- 0, /* tp_init */
- 0, /* tp_alloc */
- dialect_new, /* tp_new */
- 0, /* tp_free */
+ Dialect_Type_slots,
};
+
/*
* Return an instance of the dialect type, given a Python instance or kwarg
* description of the dialect
*/
static PyObject *
-_call_dialect(PyObject *dialect_inst, PyObject *kwargs)
+_call_dialect(PyObject *m, PyObject *dialect_inst, PyObject *kwargs)
{
- PyObject *type = (PyObject *)&Dialect_Type;
+ _csvstate *m_state = PyModule_GetState(m);
+ if (m_state == NULL) {
+ return NULL;
+ }
+
+ PyObject *type = (PyObject *)m_state->dialect_type;
if (dialect_inst) {
return PyObject_VectorcallDict(type, &dialect_inst, 1, kwargs);
}
@@ -568,11 +592,11 @@ parse_grow_buff(ReaderObj *self)
}
static int
-parse_add_char(ReaderObj *self, Py_UCS4 c)
+parse_add_char(ReaderObj *self, _csvstate *m_state, Py_UCS4 c)
{
- if (self->field_len >= _csvstate_global->field_limit) {
- PyErr_Format(_csvstate_global->error_obj, "field larger than field limit (%ld)",
- _csvstate_global->field_limit);
+ if (self->field_len >= m_state->field_limit) {
+ PyErr_Format(m_state->error_obj, "field larger than field limit (%ld)",
+ m_state->field_limit);
return -1;
}
if (self->field_len == self->field_size && !parse_grow_buff(self))
@@ -582,7 +606,7 @@ parse_add_char(ReaderObj *self, Py_UCS4 c)
}
static int
-parse_process_char(ReaderObj *self, Py_UCS4 c)
+parse_process_char(ReaderObj *self, _csvstate *m_state, Py_UCS4 c)
{
DialectObj *dialect = self->dialect;
@@ -628,7 +652,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
/* begin new unquoted field */
if (dialect->quoting == QUOTE_NONNUMERIC)
self->numeric_field = 1;
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = IN_FIELD;
}
@@ -636,14 +660,14 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
case ESCAPED_CHAR:
if (c == '\n' || c=='\r') {
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = AFTER_ESCAPED_CRNL;
break;
}
if (c == '\0')
c = '\n';
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = IN_FIELD;
break;
@@ -673,7 +697,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
}
else {
/* normal character - save in field */
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
}
break;
@@ -699,7 +723,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
}
else {
/* normal character - save in field */
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
}
break;
@@ -707,7 +731,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
case ESCAPE_IN_QUOTED_FIELD:
if (c == '\0')
c = '\n';
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = IN_QUOTED_FIELD;
break;
@@ -717,7 +741,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
if (dialect->quoting != QUOTE_NONE &&
c == dialect->quotechar) {
/* save "" as " */
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = IN_QUOTED_FIELD;
}
@@ -734,13 +758,13 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
self->state = (c == '\0' ? START_RECORD : EAT_CRNL);
}
else if (!dialect->strict) {
- if (parse_add_char(self, c) < 0)
+ if (parse_add_char(self, m_state, c) < 0)
return -1;
self->state = IN_FIELD;
}
else {
/* illegal */
- PyErr_Format(_csvstate_global->error_obj, "'%c' expected after '%c'",
+ PyErr_Format(m_state->error_obj, "'%c' expected after '%c'",
dialect->delimiter,
dialect->quotechar);
return -1;
@@ -753,7 +777,8 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
else if (c == '\0')
self->state = START_RECORD;
else {
- PyErr_Format(_csvstate_global->error_obj, "new-line character seen in unquoted field - do you need to open the file in universal-newline mode?");
+ PyErr_Format(m_state->error_obj,
+ "new-line character seen in unquoted field - do you need to open the file in universal-newline mode?");
return -1;
}
break;
@@ -784,6 +809,16 @@ Reader_iternext(ReaderObj *self)
const void *data;
PyObject *lineobj;
+ PyObject *m = _PyType_GetModuleByDef(Py_TYPE(self), &_csvmodule);
+ if (m == NULL) {
+ return NULL;
+ }
+ _csvstate *m_state = PyModule_GetState(m);
+ if (m_state == NULL) {
+ return PyErr_Format(PyExc_SystemError,
+ "dialect_new: No _csv module state found");
+ }
+
if (parse_reset(self) < 0)
return NULL;
do {
@@ -793,7 +828,7 @@ Reader_iternext(ReaderObj *self)
if (!PyErr_Occurred() && (self->field_len != 0 ||
self->state == IN_QUOTED_FIELD)) {
if (self->dialect->strict)
- PyErr_SetString(_csvstate_global->error_obj,
+ PyErr_SetString(m_state->error_obj,
"unexpected end of data");
else if (parse_save_field(self) >= 0)
break;
@@ -801,7 +836,7 @@ Reader_iternext(ReaderObj *self)
return NULL;
}
if (!PyUnicode_Check(lineobj)) {
- PyErr_Format(_csvstate_global->error_obj,
+ PyErr_Format(m_state->error_obj,
"iterator should return strings, "
"not %.200s "
"(the file should be opened in text mode)",
@@ -823,18 +858,18 @@ Reader_iternext(ReaderObj *self)
c = PyUnicode_READ(kind, data, pos);
if (c == '\0') {
Py_DECREF(lineobj);
- PyErr_Format(_csvstate_global->error_obj,
+ PyErr_Format(m_state->error_obj,
"line contains NUL");
goto err;
}
- if (parse_process_char(self, c) < 0) {
+ if (parse_process_char(self, m_state, c) < 0) {
Py_DECREF(lineobj);
goto err;
}
pos++;
}
Py_DECREF(lineobj);
- if (parse_process_char(self, 0) < 0)
+ if (parse_process_char(self, m_state, 0) < 0)
goto err;
} while (self->state != START_RECORD);
@@ -847,6 +882,7 @@ Reader_iternext(ReaderObj *self)
static void
Reader_dealloc(ReaderObj *self)
{
+ PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Py_XDECREF(self->dialect);
Py_XDECREF(self->input_iter);
@@ -854,6 +890,18 @@ Reader_dealloc(ReaderObj *self)
if (self->field != NULL)
PyMem_Free(self->field);
PyObject_GC_Del(self);
+ Py_DECREF(tp);
+}
+
+static void
+Reader_finalize(ReaderObj *self)
+{
+ Py_XDECREF(self->dialect);
+ Py_XDECREF(self->input_iter);
+ Py_XDECREF(self->fields);
+ if (self->field != NULL) {
+ PyMem_Free(self->field);
+ }
}
static int
@@ -893,47 +941,36 @@ static struct PyMemberDef Reader_memberlist[] = {
};
-static PyTypeObject Reader_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "_csv.reader", /*tp_name*/
- sizeof(ReaderObj), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- /* methods */
- (destructor)Reader_dealloc, /*tp_dealloc*/
- 0, /*tp_vectorcall_offset*/
- (getattrfunc)0, /*tp_getattr*/
- (setattrfunc)0, /*tp_setattr*/
- 0, /*tp_as_async*/
- (reprfunc)0, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- (hashfunc)0, /*tp_hash*/
- (ternaryfunc)0, /*tp_call*/
- (reprfunc)0, /*tp_str*/
- 0, /*tp_getattro*/
- 0, /*tp_setattro*/
- 0, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
- Py_TPFLAGS_HAVE_GC, /*tp_flags*/
- Reader_Type_doc, /*tp_doc*/
- (traverseproc)Reader_traverse, /*tp_traverse*/
- (inquiry)Reader_clear, /*tp_clear*/
- 0, /*tp_richcompare*/
- 0, /*tp_weaklistoffset*/
- PyObject_SelfIter, /*tp_iter*/
- (getiterfunc)Reader_iternext, /*tp_iternext*/
- Reader_methods, /*tp_methods*/
- Reader_memberlist, /*tp_members*/
- 0, /*tp_getset*/
+static PyType_Slot Reader_Type_slots[] = {
+ {Py_tp_doc, (char*)Reader_Type_doc},
+ {Py_tp_traverse, Reader_traverse},
+ {Py_tp_clear, Reader_clear},
+ {Py_tp_iter, PyObject_SelfIter},
+ {Py_tp_iternext, Reader_iternext},
+ {Py_tp_methods, Reader_methods},
+ {Py_tp_members, Reader_memberlist},
+ {Py_tp_finalize, Reader_finalize},
+ {Py_tp_dealloc, Reader_dealloc},
+ {0, NULL}
+};
+PyType_Spec Reader_Type_spec = {
+ "_csv.reader",
+ sizeof(ReaderObj),
+ 0,
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
+ Py_TPFLAGS_HAVE_GC,
+ Reader_Type_slots
};
+
static PyObject *
csv_reader(PyObject *module, PyObject *args, PyObject *keyword_args)
{
PyObject * iterator, * dialect = NULL;
- ReaderObj * self = PyObject_GC_New(ReaderObj, &Reader_Type);
+ ReaderObj * self = PyObject_GC_New(
+ ReaderObj,
+ get_csv_state(module)->reader_type);
if (!self)
return NULL;
@@ -959,7 +996,7 @@ csv_reader(PyObject *module, PyObject *args, PyObject *keyword_args)
Py_DECREF(self);
return NULL;
}
- self->dialect = (DialectObj *)_call_dialect(dialect, keyword_args);
+ self->dialect = (DialectObj *)_call_dialect(module, dialect, keyword_args);
if (self->dialect == NULL) {
Py_DECREF(self);
return NULL;
@@ -1048,7 +1085,7 @@ join_append_data(WriterObj *self, unsigned int field_kind, const void *field_dat
}
if (want_escape) {
if (!dialect->escapechar) {
- PyErr_Format(_csvstate_global->error_obj,
+ PyErr_Format(self->error_obj,
"need to escape, but no escapechar set");
return -1;
}
@@ -1166,7 +1203,7 @@ csv_writerow(WriterObj *self, PyObject *seq)
iter = PyObject_GetIter(seq);
if (iter == NULL) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
- PyErr_Format(_csvstate_global->error_obj,
+ PyErr_Format(self->error_obj,
"iterable expected, not %.200s",
Py_TYPE(seq)->tp_name);
}
@@ -1223,7 +1260,7 @@ csv_writerow(WriterObj *self, PyObject *seq)
if (self->num_fields > 0 && self->rec_len == 0) {
if (dialect->quoting == QUOTE_NONE) {
- PyErr_Format(_csvstate_global->error_obj,
+ PyErr_Format(self->error_obj,
"single empty field record must be quoted");
return NULL;
}
@@ -1292,22 +1329,12 @@ static struct PyMemberDef Writer_memberlist[] = {
{ NULL }
};
-static void
-Writer_dealloc(WriterObj *self)
-{
- PyObject_GC_UnTrack(self);
- Py_XDECREF(self->dialect);
- Py_XDECREF(self->write);
- if (self->rec != NULL)
- PyMem_Free(self->rec);
- PyObject_GC_Del(self);
-}
-
static int
Writer_traverse(WriterObj *self, visitproc visit, void *arg)
{
Py_VISIT(self->dialect);
Py_VISIT(self->write);
+ Py_VISIT(self->error_obj);
return 0;
}
@@ -1316,9 +1343,19 @@ Writer_clear(WriterObj *self)
{
Py_CLEAR(self->dialect);
Py_CLEAR(self->write);
+ Py_CLEAR(self->error_obj);
return 0;
}
+static void
+Writer_finalize(WriterObj *self)
+{
+ Writer_clear(self);
+ if (self->rec != NULL) {
+ PyMem_Free(self->rec);
+ }
+}
+
PyDoc_STRVAR(Writer_Type_doc,
"CSV writer\n"
"\n"
@@ -1326,46 +1363,33 @@ PyDoc_STRVAR(Writer_Type_doc,
"in CSV format from sequence input.\n"
);
-static PyTypeObject Writer_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "_csv.writer", /*tp_name*/
- sizeof(WriterObj), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- /* methods */
- (destructor)Writer_dealloc, /*tp_dealloc*/
- 0, /*tp_vectorcall_offset*/
- (getattrfunc)0, /*tp_getattr*/
- (setattrfunc)0, /*tp_setattr*/
- 0, /*tp_as_async*/
- (reprfunc)0, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- (hashfunc)0, /*tp_hash*/
- (ternaryfunc)0, /*tp_call*/
- (reprfunc)0, /*tp_str*/
- 0, /*tp_getattro*/
- 0, /*tp_setattro*/
- 0, /*tp_as_buffer*/
+static PyType_Slot Writer_Type_slots[] = {
+ {Py_tp_finalize, Writer_finalize},
+ {Py_tp_doc, (char*)Writer_Type_doc},
+ {Py_tp_traverse, Writer_traverse},
+ {Py_tp_clear, Writer_clear},
+ {Py_tp_methods, Writer_methods},
+ {Py_tp_members, Writer_memberlist},
+ {0, NULL}
+};
+
+PyType_Spec Writer_Type_spec = {
+ "_csv.writer",
+ sizeof(WriterObj),
+ 0,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
- Py_TPFLAGS_HAVE_GC, /*tp_flags*/
- Writer_Type_doc,
- (traverseproc)Writer_traverse, /*tp_traverse*/
- (inquiry)Writer_clear, /*tp_clear*/
- 0, /*tp_richcompare*/
- 0, /*tp_weaklistoffset*/
- (getiterfunc)0, /*tp_iter*/
- (getiterfunc)0, /*tp_iternext*/
- Writer_methods, /*tp_methods*/
- Writer_memberlist, /*tp_members*/
- 0, /*tp_getset*/
+ Py_TPFLAGS_HAVE_GC,
+ Writer_Type_slots,
};
+
static PyObject *
csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
{
PyObject * output_file, * dialect = NULL;
- WriterObj * self = PyObject_GC_New(WriterObj, &Writer_Type);
+ WriterObj * self = PyObject_GC_New(
+ WriterObj,
+ get_csv_state(module)->writer_type);
_Py_IDENTIFIER(write);
if (!self)
@@ -1379,6 +1403,9 @@ 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;
+ Py_INCREF(self->error_obj);
+
if (!PyArg_UnpackTuple(args, "", 1, 2, &output_file, &dialect)) {
Py_DECREF(self);
return NULL;
@@ -1393,7 +1420,7 @@ csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
Py_DECREF(self);
return NULL;
}
- self->dialect = (DialectObj *)_call_dialect(dialect, keyword_args);
+ self->dialect = (DialectObj *)_call_dialect(module, dialect, keyword_args);
if (self->dialect == NULL) {
Py_DECREF(self);
return NULL;
@@ -1408,7 +1435,7 @@ csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
static PyObject *
csv_list_dialects(PyObject *module, PyObject *args)
{
- return PyDict_Keys(_csvstate_global->dialects);
+ return PyDict_Keys(get_csv_state(module)->dialects);
}
static PyObject *
@@ -1426,10 +1453,10 @@ csv_register_dialect(PyObject *module, PyObject *args, PyObject *kwargs)
}
if (PyUnicode_READY(name_obj) == -1)
return NULL;
- dialect = _call_dialect(dialect_obj, kwargs);
+ dialect = _call_dialect(module, dialect_obj, kwargs);
if (dialect == NULL)
return NULL;
- if (PyDict_SetItem(_csvstate_global->dialects, name_obj, dialect) < 0) {
+ if (PyDict_SetItem(get_csv_state(module)->dialects, name_obj, dialect) < 0) {
Py_DECREF(dialect);
return NULL;
}
@@ -1440,9 +1467,9 @@ csv_register_dialect(PyObject *module, PyObject *args, PyObject *kwargs)
static PyObject *
csv_unregister_dialect(PyObject *module, PyObject *name_obj)
{
- if (PyDict_DelItem(_csvstate_global->dialects, name_obj) < 0) {
+ if (PyDict_DelItem(get_csv_state(module)->dialects, name_obj) < 0) {
if (PyErr_ExceptionMatches(PyExc_KeyError)) {
- PyErr_Format(_csvstate_global->error_obj, "unknown dialect");
+ PyErr_Format(get_csv_state(module)->error_obj, "unknown dialect");
}
return NULL;
}
@@ -1452,14 +1479,14 @@ csv_unregister_dialect(PyObject *module, PyObject *name_obj)
static PyObject *
csv_get_dialect(PyObject *module, PyObject *name_obj)
{
- return get_dialect_from_registry(name_obj);
+ return get_dialect_from_registry(name_obj, get_csv_state(module));
}
static PyObject *
csv_field_size_limit(PyObject *module, PyObject *args)
{
PyObject *new_limit = NULL;
- long old_limit = _csvstate_global->field_limit;
+ long old_limit = get_csv_state(module)->field_limit;
if (!PyArg_UnpackTuple(args, "field_size_limit", 0, 1, &new_limit))
return NULL;
@@ -1469,15 +1496,25 @@ csv_field_size_limit(PyObject *module, PyObject *args)
"limit must be an integer");
return NULL;
}
- _csvstate_global->field_limit = PyLong_AsLong(new_limit);
- if (_csvstate_global->field_limit == -1 && PyErr_Occurred()) {
- _csvstate_global->field_limit = old_limit;
+ 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;
return NULL;
}
}
return PyLong_FromLong(old_limit);
}
+static PyType_Slot error_slots[] = {
+ {0, NULL},
+};
+
+PyType_Spec error_spec = {
+ .name = "_csv.Error",
+ .flags = Py_TPFLAGS_DEFAULT,
+ .slots = error_slots,
+};
+
/*
* MODULE
*/
@@ -1610,68 +1647,105 @@ static struct PyMethodDef csv_methods[] = {
{ NULL, NULL }
};
-static struct PyModuleDef _csvmodule = {
- PyModuleDef_HEAD_INIT,
- "_csv",
- csv_module_doc,
- sizeof(_csvstate),
- csv_methods,
- NULL,
- _csv_traverse,
- _csv_clear,
- _csv_free
-};
-
-PyMODINIT_FUNC
-PyInit__csv(void)
-{
- PyObject *module;
+static int
+csv_exec(PyObject *module) {
const StyleDesc *style;
+ PyObject *temp;
+ _csvstate *m_state = get_csv_state(module);
- if (PyType_Ready(&Reader_Type) < 0)
- return NULL;
+ temp = PyType_FromModuleAndSpec(module, &Dialect_Type_spec, NULL);
+ if (temp == NULL) {
+ return -1;
+ }
+ if (PyModule_AddObject(module, "Dialect", temp)) {
+ return -1;
+ }
+ Py_INCREF(temp);
+ m_state->dialect_type = (PyTypeObject *)temp;
- if (PyType_Ready(&Writer_Type) < 0)
- return NULL;
+ temp = PyType_FromModuleAndSpec(module, &Reader_Type_spec, NULL);
+ if (temp == NULL) {
+ return -1;
+ }
+ if (PyModule_AddObject(module, "Reader", temp)) {
+ return -1;
+ }
+ Py_INCREF(temp);
+ m_state->reader_type = (PyTypeObject *)temp;
- /* Create the module and add the functions */
- module = PyModule_Create(&_csvmodule);
- if (module == NULL)
- return NULL;
+ temp = PyType_FromModuleAndSpec(module, &Writer_Type_spec, NULL);
+ if (temp == NULL) {
+ return -1;
+ }
+ if (PyModule_AddObject(module, "Writer", temp)) {
+ return -1;
+ }
+ Py_INCREF(temp);
+ m_state->writer_type = (PyTypeObject *)temp;
/* Add version to the module. */
if (PyModule_AddStringConstant(module, "__version__",
- MODULE_VERSION) == -1)
- return NULL;
+ MODULE_VERSION) == -1) {
+ return -1;
+ }
/* Set the field limit */
- get_csv_state(module)->field_limit = 128 * 1024;
- /* Do I still need to add this var to the Module Dict? */
+ m_state->field_limit = 128 * 1024;
/* Add _dialects dictionary */
- get_csv_state(module)->dialects = PyDict_New();
- if (get_csv_state(module)->dialects == NULL)
- return NULL;
- Py_INCREF(get_csv_state(module)->dialects);
- if (PyModule_AddObject(module, "_dialects", get_csv_state(module)->dialects))
- return NULL;
+ m_state->dialects = PyDict_New();
+ if (m_state->dialects == NULL) {
+ return -1;
+ }
+ Py_INCREF(m_state->dialects);
+ if (PyModule_AddObject(module, "_dialects", m_state->dialects)) {
+ return -1;
+ }
/* Add quote styles into dictionary */
for (style = quote_styles; style->name; style++) {
if (PyModule_AddIntConstant(module, style->name,
style->style) == -1)
- return NULL;
+ return -1;
}
- if (PyModule_AddType(module, &Dialect_Type)) {
- return NULL;
+ /* Add the CSV exception object to the module. */
+ PyObject *bases = PyTuple_New(1);
+ if (bases == NULL) {
+ return -1;
+ }
+ PyTuple_SET_ITEM(bases, 0, PyExc_Exception);
+ m_state->error_obj = PyType_FromModuleAndSpec(module, &error_spec, bases);
+ Py_DECREF(bases);
+ if (m_state->error_obj == NULL) {
+ return -1;
+ }
+ if (PyModule_AddType(module, (PyTypeObject *)m_state->error_obj) != 0) {
+ return -1;
}
- /* Add the CSV exception object to the module. */
- get_csv_state(module)->error_obj = PyErr_NewException("_csv.Error", NULL, NULL);
- if (get_csv_state(module)->error_obj == NULL)
- return NULL;
- Py_INCREF(get_csv_state(module)->error_obj);
- PyModule_AddObject(module, "Error", get_csv_state(module)->error_obj);
- return module;
+ return 0;
+}
+
+static PyModuleDef_Slot csv_slots[] = {
+ {Py_mod_exec, csv_exec},
+ {0, NULL}
+};
+
+static struct PyModuleDef _csvmodule = {
+ PyModuleDef_HEAD_INIT,
+ "_csv",
+ csv_module_doc,
+ sizeof(_csvstate),
+ csv_methods,
+ csv_slots,
+ _csv_traverse,
+ _csv_clear,
+ _csv_free
+};
+
+PyMODINIT_FUNC
+PyInit__csv(void)
+{
+ return PyModuleDef_Init(&_csvmodule);
}
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
index d69ae628fa7a40..7528422339713f 100644
--- a/Modules/_testmultiphase.c
+++ b/Modules/_testmultiphase.c
@@ -121,24 +121,30 @@ static PyType_Spec Example_Type_spec = {
};
+static PyModuleDef def_meth_state_access;
+
/*[clinic input]
_testmultiphase.StateAccessType.get_defining_module
cls: defining_class
Return the module of the defining class.
+
+Also tests that result of _PyType_GetModuleByDef matches defining_class's
+module.
[clinic start generated code]*/
static PyObject *
_testmultiphase_StateAccessType_get_defining_module_impl(StateAccessTypeObject *self,
PyTypeObject *cls)
-/*[clinic end generated code: output=ba2a14284a5d0921 input=946149f91cf72c0d]*/
+/*[clinic end generated code: output=ba2a14284a5d0921 input=356f999fc16e0933]*/
{
PyObject *retval;
retval = PyType_GetModule(cls);
if (retval == NULL) {
return NULL;
}
+ assert(_PyType_GetModuleByDef(Py_TYPE(self), &def_meth_state_access) == retval);
Py_INCREF(retval);
return retval;
}
diff --git a/Modules/clinic/_testmultiphase.c.h b/Modules/clinic/_testmultiphase.c.h
index 0d38c230f71865..55f934be8c6c1b 100644
--- a/Modules/clinic/_testmultiphase.c.h
+++ b/Modules/clinic/_testmultiphase.c.h
@@ -6,7 +6,10 @@ PyDoc_STRVAR(_testmultiphase_StateAccessType_get_defining_module__doc__,
"get_defining_module($self, /)\n"
"--\n"
"\n"
-"Return the module of the defining class.");
+"Return the module of the defining class.\n"
+"\n"
+"Also tests that result of _PyType_GetModuleByDef matches defining_class\'s\n"
+"module.");
#define _TESTMULTIPHASE_STATEACCESSTYPE_GET_DEFINING_MODULE_METHODDEF \
{"get_defining_module", (PyCFunction)(void(*)(void))_testmultiphase_StateAccessType_get_defining_module, METH_METHOD|METH_FASTCALL|METH_KEYWORDS, _testmultiphase_StateAccessType_get_defining_module__doc__},
@@ -98,4 +101,4 @@ _testmultiphase_StateAccessType_get_count(StateAccessTypeObject *self, PyTypeObj
exit:
return return_value;
}
-/*[clinic end generated code: output=39eea487e94e7f5d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f01137bb3b373e14 input=a9049054013a1b77]*/
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 36c7662e081a40..a708ceedbf046c 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3155,6 +3155,44 @@ PyType_GetModuleState(PyTypeObject *type)
return PyModule_GetState(m);
}
+
+/* Get the module of the first superclass where the module has the
+ * given PyModuleDef.
+ * Implemented by walking the MRO, is relatively slow.
+ *
+ * This is internal API for experimentation within stdlib. Discussion:
+ * https://mail.python.org/archives/list/capi-sig@python.org/thread/T3P2QNLNLBRFHWSKYSTPMVEIL2EEKFJU/
+ */
+PyObject *
+_PyType_GetModuleByDef(PyTypeObject *type, struct PyModuleDef *def)
+{
+ assert(PyType_Check(type));
+ assert(type->tp_mro);
+ int i;
+ for (i = 0; i < PyTuple_GET_SIZE(type->tp_mro); i++) {
+ PyObject *super = PyTuple_GET_ITEM(type->tp_mro, i);
+ if (!PyType_HasFeature((PyTypeObject *)super, Py_TPFLAGS_HEAPTYPE)) {
+ /* Currently, there's no way for static types to inherit
+ * from heap types, but to allow that possibility,
+ * we `continue` rather than `break`.
+ * We'll just potentially loop a few more times before throwing
+ * the error.
+ */
+ continue;
+ }
+ PyHeapTypeObject *ht = (PyHeapTypeObject*)super;
+ if (ht->ht_module && PyModule_GetDef(ht->ht_module) == def) {
+ return ht->ht_module;
+ }
+ }
+ PyErr_Format(
+ PyExc_TypeError,
+ "_PyType_GetModuleByDef: No superclass of '%s' has the given module",
+ type->tp_name);
+ return NULL;
+}
+
+
/* Internal API to look for a name through the MRO, bypassing the method cache.
This returns a borrowed reference, and might set an exception.
'error' is set to: -1: error with exception; 1: error without exception; 0: ok */
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