diff options
Diffstat (limited to 'Modules/_csv.c')
| -rw-r--r-- | Modules/_csv.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index 7a78541bf2..fb5530ab57 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -152,8 +152,7 @@ static PyObject * get_nullchar_as_None(Py_UCS4 c) { if (c == '\0') { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } else return PyUnicode_FromOrdinal(c); @@ -209,23 +208,17 @@ _set_int(const char *name, int *target, PyObject *src, int dflt) if (src == NULL) *target = dflt; else { - long value; + int value; if (!PyLong_CheckExact(src)) { PyErr_Format(PyExc_TypeError, "\"%s\" must be an integer", name); return -1; } - value = PyLong_AsLong(src); - if (value == -1 && PyErr_Occurred()) - return -1; -#if SIZEOF_LONG > SIZEOF_INT - if (value > INT_MAX || value < INT_MIN) { - PyErr_Format(PyExc_ValueError, - "integer out of range for \"%s\"", name); + value = _PyLong_AsInt(src); + if (value == -1 && PyErr_Occurred()) { return -1; } -#endif - *target = (int)value; + *target = value; } return 0; } @@ -1300,8 +1293,7 @@ csv_writerows(WriterObj *self, PyObject *seqseq) Py_DECREF(row_iter); if (PyErr_Occurred()) return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static struct PyMethodDef Writer_methods[] = { @@ -1456,8 +1448,7 @@ csv_register_dialect(PyObject *module, PyObject *args, PyObject *kwargs) return NULL; } Py_DECREF(dialect); - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * @@ -1465,8 +1456,7 @@ csv_unregister_dialect(PyObject *module, PyObject *name_obj) { if (PyDict_DelItem(_csvstate_global->dialects, name_obj) < 0) return PyErr_Format(_csvstate_global->error_obj, "unknown dialect"); - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * |