[Python-checkins] python/dist/src/Modules _csv.c,1.23,1.24
andrewmcnamara at users.sourceforge.net
andrewmcnamara at users.sourceforge.net
Tue Jan 11 02:07:26 CET 2005
Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12152/Modules
Modified Files:
_csv.c
Log Message:
Factor out the code for making a dialect instance.
Index: _csv.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_csv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- _csv.c 10 Jan 2005 23:17:35 -0000 1.23
+++ _csv.c 11 Jan 2005 01:07:23 -0000 1.24
@@ -496,6 +496,24 @@
0, /* tp_free */
};
+/*
+ * 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)
+{
+ PyObject *ctor_args;
+ PyObject *dialect;
+
+ ctor_args = Py_BuildValue(dialect_inst ? "(O)" : "()", dialect_inst);
+ if (ctor_args == NULL)
+ return NULL;
+ dialect = PyObject_Call((PyObject *)&Dialect_Type, ctor_args, kwargs);
+ Py_DECREF(ctor_args);
+ return dialect;
+}
+
static void
parse_save_field(ReaderObj *self)
{
@@ -862,7 +880,7 @@
static PyObject *
csv_reader(PyObject *module, PyObject *args, PyObject *keyword_args)
{
- PyObject * iterator, * dialect = NULL, *ctor_args;
+ PyObject * iterator, * dialect = NULL;
ReaderObj * self = PyObject_GC_New(ReaderObj, &Reader_Type);
if (!self)
@@ -890,14 +908,7 @@
Py_DECREF(self);
return NULL;
}
- ctor_args = Py_BuildValue(dialect ? "(O)" : "()", dialect);
- if (ctor_args == NULL) {
- Py_DECREF(self);
- return NULL;
- }
- self->dialect = (DialectObj *)PyObject_Call((PyObject *)&Dialect_Type,
- ctor_args, keyword_args);
- Py_DECREF(ctor_args);
+ self->dialect = (DialectObj *)_call_dialect(dialect, keyword_args);
if (self->dialect == NULL) {
Py_DECREF(self);
return NULL;
@@ -1313,7 +1324,7 @@
static PyObject *
csv_writer(PyObject *module, PyObject *args, PyObject *keyword_args)
{
- PyObject * output_file, * dialect = NULL, *ctor_args;
+ PyObject * output_file, * dialect = NULL;
WriterObj * self = PyObject_GC_New(WriterObj, &Writer_Type);
if (!self)
@@ -1338,14 +1349,7 @@
Py_DECREF(self);
return NULL;
}
- ctor_args = Py_BuildValue(dialect ? "(O)" : "()", dialect);
- if (ctor_args == NULL) {
- Py_DECREF(self);
- return NULL;
- }
- self->dialect = (DialectObj *)PyObject_Call((PyObject *)&Dialect_Type,
- ctor_args, keyword_args);
- Py_DECREF(ctor_args);
+ self->dialect = (DialectObj *)_call_dialect(dialect, keyword_args);
if (self->dialect == NULL) {
Py_DECREF(self);
return NULL;
More information about the Python-checkins
mailing list