Skip to content

bpo-34533: Apply PEP384 to _csv module #8977

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
eduardo-elizondo wants to merge 8 commits into from
Closed

bpo-34533: Apply PEP384 to _csv module #8977

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
47d1f72
Apply PEP384 to _csv module
eduardo-elizondo Aug 28, 2018
b41e84d
Added News
eduardo-elizondo Aug 28, 2018
9adcfe7
Fixed test and improves csv file
eduardo-elizondo Aug 28, 2018
f61164a
Added module name
eduardo-elizondo Aug 28, 2018
22af36a
csv Fixes
eduardo-elizondo Aug 28, 2018
5eb802a
Fix merge artifacts
eduardo-elizondo Aug 28, 2018
c04190f
Removed static module
eduardo-elizondo Aug 29, 2018
cbd2085
Add subinterpreter support
eduardo-elizondo Aug 30, 2018
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
Removed static module
  • Loading branch information
@eduardo-elizondo
eduardo-elizondo committed Aug 29, 2018
commit c04190fb2d53188de407735de74ef728e1d5a0b1
38 changes: 19 additions & 19 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ _csv_free(void *m)
_csv_clear((PyObject *)m);
}

static struct PyModuleDef _csvmodule_def;
static PyObject *_csvmodule;
static struct PyModuleDef module_def;

#define _csvstate_global ((_csvstate *)PyModule_GetState(PyState_FindModule(&_csvmodule_def)))
#define _csvstate_global ((_csvstate *)PyModule_GetState(PyState_FindModule(&module_def)))

typedef enum {
START_RECORD, START_FIELD, ESCAPED_CHAR, IN_FIELD,
Expand Down Expand Up @@ -1546,7 +1545,7 @@ static struct PyMethodDef csv_methods[] = {
{ NULL, NULL }
};

static struct PyModuleDef _csvmodule_def = {
static struct PyModuleDef module_def = {
PyModuleDef_HEAD_INIT,
"_csv",
csv_module_doc,
Expand All @@ -1561,6 +1560,7 @@ static struct PyModuleDef _csvmodule_def = {
PyMODINIT_FUNC
PyInit__csv(void)
{
PyObject *module;
const StyleDesc *style;

Dialect_Type = PyType_FromSpec(&Dialect_Type_spec);
Expand All @@ -1578,44 +1578,44 @@ PyInit__csv(void)
((PyTypeObject *)Writer_Type)->tp_new = NULL;

/* Create the module and add the functions */
_csvmodule = PyModule_Create(&_csvmodule_def);
if (_csvmodule == NULL)
module = PyModule_Create(&module_def);
if (module == NULL)
return NULL;

/* Add version to the module. */
if (PyModule_AddStringConstant(_csvmodule, "__version__",
if (PyModule_AddStringConstant(module, "__version__",
MODULE_VERSION) == -1)
return NULL;

/* Set the field limit */
_csvstate(_csvmodule)->field_limit = 128 * 1024;
_csvstate(module)->field_limit = 128 * 1024;
/* Do I still need to add this var to the Module Dict? */

/* Add _dialects dictionary */
_csvstate(_csvmodule)->dialects = PyDict_New();
if (_csvstate(_csvmodule)->dialects == NULL)
_csvstate(module)->dialects = PyDict_New();
if (_csvstate(module)->dialects == NULL)
return NULL;
Py_INCREF(_csvstate(_csvmodule)->dialects);
if (PyModule_AddObject(_csvmodule, "_dialects", _csvstate(_csvmodule)->dialects))
Py_INCREF(_csvstate(module)->dialects);
if (PyModule_AddObject(module, "_dialects", _csvstate(module)->dialects))
return NULL;

/* Add quote styles into dictionary */
for (style = quote_styles; style->name; style++) {
if (PyModule_AddIntConstant(_csvmodule, style->name,
if (PyModule_AddIntConstant(module, style->name,
style->style) == -1)
return NULL;
}

/* Add the Dialect type */
if (PyModule_AddObject(_csvmodule, "Dialect", Dialect_Type))
if (PyModule_AddObject(module, "Dialect", Dialect_Type))
return NULL;
Py_INCREF(Dialect_Type);

/* Add the CSV exception object to the module. */
_csvstate(_csvmodule)->error_obj = PyErr_NewException("_csv.Error", NULL, NULL);
if (_csvstate(_csvmodule)->error_obj == NULL)
_csvstate(module)->error_obj = PyErr_NewException("_csv.Error", NULL, NULL);
if (_csvstate(module)->error_obj == NULL)
return NULL;
Py_INCREF(_csvstate(_csvmodule)->error_obj);
PyModule_AddObject(_csvmodule, "Error", _csvstate(_csvmodule)->error_obj);
return _csvmodule;
Py_INCREF(_csvstate(module)->error_obj);
PyModule_AddObject(module, "Error", _csvstate(module)->error_obj);
return module;
}