[Python-checkins] python/nondist/sandbox/csv _csv.c,1.26,1.27

[andrewmcnamara@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv28955

Modified Files:
	_csv.c 
Log Message:
A few minor changes so the module works with Python2.2


Index: _csv.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/_csv.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** _csv.c	10 Feb 2003 08:52:55 -0000	1.26
--- _csv.c	10 Feb 2003 09:41:28 -0000	1.27
***************
*** 112,117 ****
          dialect_obj = PyDict_GetItem(dialects, name_obj);
          if (dialect_obj == NULL)
!             return PyErr_Format(error_obj, "unknown dialect '%s'", 
!                                 PyString_AsString(name_obj));
          Py_INCREF(dialect_obj);
          return dialect_obj;
--- 112,116 ----
          dialect_obj = PyDict_GetItem(dialects, name_obj);
          if (dialect_obj == NULL)
!             return PyErr_Format(error_obj, "unknown dialect");
          Py_INCREF(dialect_obj);
          return dialect_obj;
***************
*** 407,411 ****
  	PyType_GenericAlloc,	                /* tp_alloc */
  	dialect_new,			        /* tp_new */
! 	PyObject_Del,                           /* tp_free */
  };
  
--- 406,410 ----
  	PyType_GenericAlloc,	                /* tp_alloc */
  	dialect_new,			        /* tp_new */
! 	0,                           /* tp_free */
  };
  
***************
*** 1173,1178 ****
  csv_list_dialects(PyObject *module, PyObject *args)
  {
-         if (!PyArg_ParseTuple(args, ""))
-                 return NULL;
          return PyDict_Keys(dialects);
  }
--- 1172,1175 ----
***************
*** 1183,1189 ****
          PyObject *name_obj, *dialect_obj;
  
!         if (!PyArg_ParseTuple(args, "O!O", 
!                               &PyBaseString_Type, &name_obj,
!                               &dialect_obj)) {
                  return NULL;
          }
--- 1180,1188 ----
          PyObject *name_obj, *dialect_obj;
  
!         if (!PyArg_ParseTuple(args, "OO", &name_obj, &dialect_obj))
!                 return NULL;
!         if (!PyString_Check(name_obj) && PyUnicode_Check(name_obj)) {
!                 PyErr_SetString(PyExc_TypeError, 
!                                 "dialect name must be a string or unicode");
                  return NULL;
          }
***************
*** 1195,1199 ****
                  Py_DECREF(dialect_obj);
                  if (new_dia == NULL)
!                         return 0;
                  dialect_obj = new_dia;
          }
--- 1194,1198 ----
                  Py_DECREF(dialect_obj);
                  if (new_dia == NULL)
!                         return NULL;
                  dialect_obj = new_dia;
          }
***************
*** 1202,1206 ****
                  PyErr_SetString(PyExc_TypeError, "dialect must be an instance");
                  Py_DECREF(dialect_obj);
!                 return 0;
          }
          if (PyObject_SetAttrString(dialect_obj, "_name", name_obj) < 0) {
--- 1201,1205 ----
                  PyErr_SetString(PyExc_TypeError, "dialect must be an instance");
                  Py_DECREF(dialect_obj);
!                 return NULL;
          }
          if (PyObject_SetAttrString(dialect_obj, "_name", name_obj) < 0) {
***************
*** 1222,1230 ****
          PyObject *name_obj;
  
!         if (!PyArg_ParseTuple(args, "O!", &PyBaseString_Type, &name_obj))
                  return NULL;
          if (PyDict_DelItem(dialects, name_obj) < 0)
!                 return PyErr_Format(error_obj, "unknown dialect '%s'",
!                                     PyString_AsString(name_obj));
          Py_INCREF(Py_None);
          return Py_None;
--- 1221,1228 ----
          PyObject *name_obj;
  
!         if (!PyArg_ParseTuple(args, "O", &name_obj))
                  return NULL;
          if (PyDict_DelItem(dialects, name_obj) < 0)
!                 return PyErr_Format(error_obj, "unknown dialect");
          Py_INCREF(Py_None);
          return Py_None;
***************
*** 1236,1240 ****
          PyObject *name_obj;
  
!         if (!PyArg_ParseTuple(args, "O!", &PyBaseString_Type, &name_obj))
                  return NULL;
          return get_dialect_from_registry(name_obj);
--- 1234,1238 ----
          PyObject *name_obj;
  
!         if (!PyArg_ParseTuple(args, "O", &name_obj))
                  return NULL;
          return get_dialect_from_registry(name_obj);
***************
*** 1353,1357 ****
              METH_VARARGS | METH_KEYWORDS, csv_writer_doc},
          { "list_dialects", (PyCFunction)csv_list_dialects, 
!             METH_VARARGS, csv_list_dialects_doc},
          { "register_dialect", (PyCFunction)csv_register_dialect, 
              METH_VARARGS, csv_register_dialect_doc},
--- 1351,1355 ----
              METH_VARARGS | METH_KEYWORDS, csv_writer_doc},
          { "list_dialects", (PyCFunction)csv_list_dialects, 
!             METH_NOARGS, csv_list_dialects_doc},
          { "register_dialect", (PyCFunction)csv_register_dialect, 
              METH_VARARGS, csv_register_dialect_doc},