mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix some miscellaneous places that incorrectly insisted on str8.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-10 18:04:33 +00:00
parent 3b116a3187
commit bce56a6c5b
3 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/_csv.c
View file

@ -235,19 +235,19 @@ _set_char(const char *name, char *target, PyObject *src, char dflt)
if (src == NULL)
*target = dflt;
else {
if (src == Py_None || PyString_Size(src) == 0)
*target = '\0';
else if (!PyString_Check(src) || PyString_Size(src) != 1) {
PyErr_Format(PyExc_TypeError,
"\"%s\" must be an 1-character string",
name);
return -1;
}
else {
char *s = PyString_AsString(src);
if (s == NULL)
*target = '\0';
if (src != Py_None) {
const char *buf;
Py_ssize_t len;
if (PyObject_AsCharBuffer(src, &buf, &len) < 0 ||
len > 1) {
PyErr_Format(PyExc_TypeError,
"\"%s\" must be an 1-character string",
name);
return -1;
*target = s[0];
}
if (len > 0)
*target = buf[0];
}
}
return 0;