Commit 7b01a834 authored by Skip Montanaro's avatar Skip Montanaro

use PyModule_Add{Int,String}Constant() where appropriate

(thanks to Neal Norwitz for the code review, BTW)
parent 577c7a76
...@@ -12,6 +12,8 @@ module instead. ...@@ -12,6 +12,8 @@ module instead.
*/ */
#define MODULE_VERSION "1.0"
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h"
...@@ -1440,9 +1442,6 @@ PyMODINIT_FUNC ...@@ -1440,9 +1442,6 @@ PyMODINIT_FUNC
init_csv(void) init_csv(void)
{ {
PyObject *module; PyObject *module;
PyObject *rev;
PyObject *v;
int res;
StyleDesc *style; StyleDesc *style;
if (PyType_Ready(&Dialect_Type) < 0) if (PyType_Ready(&Dialect_Type) < 0)
...@@ -1460,10 +1459,8 @@ init_csv(void) ...@@ -1460,10 +1459,8 @@ init_csv(void)
return; return;
/* Add version to the module. */ /* Add version to the module. */
rev = PyString_FromString("1.0"); if (PyModule_AddStringConstant(module, "__version__",
if (rev == NULL) MODULE_VERSION) == -1)
return;
if (PyModule_AddObject(module, "__version__", rev) < 0)
return; return;
/* Add _dialects dictionary */ /* Add _dialects dictionary */
...@@ -1475,11 +1472,8 @@ init_csv(void) ...@@ -1475,11 +1472,8 @@ init_csv(void)
/* Add quote styles into dictionary */ /* Add quote styles into dictionary */
for (style = quote_styles; style->name; style++) { for (style = quote_styles; style->name; style++) {
v = PyInt_FromLong(style->style); if (PyModule_AddIntConstant(module, style->name,
if (v == NULL) style->style) == -1)
return;
res = PyModule_AddObject(module, style->name, v);
if (res < 0)
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment