Mercurial > cpython-lru_cache-weakref
diff Python/structmember.c @ 43603:dd03aa741f56
This is the uncontroversial half of patch 1263 by Thomas Lee:
changes to codecs.c and structmember.c to use PyUnicode instead of
PyString.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Fri, 19 Oct 2007 21:48:41 +0000 |
| parents | 0fcc18aba385 |
| children | f324631462a2 |
line wrap: on
line diff
--- a/Python/structmember.c Fri Oct 19 07:34:48 2007 +0000 +++ b/Python/structmember.c Fri Oct 19 21:48:41 2007 +0000 @@ -51,13 +51,13 @@ v = Py_None; } else - v = PyString_FromString(*(char**)addr); + v = PyUnicode_FromString(*(char**)addr); break; case T_STRING_INPLACE: - v = PyString_FromString((char*)addr); + v = PyUnicode_FromString((char*)addr); break; case T_CHAR: - v = PyString_FromStringAndSize((char*)addr, 1); + v = PyUnicode_FromStringAndSize((char*)addr, 1); break; case T_OBJECT: v = *(PyObject **)addr; @@ -225,8 +225,8 @@ Py_XDECREF(oldv); break; case T_CHAR: - if (PyString_Check(v) && PyString_Size(v) == 1) { - *(char*)addr = PyString_AsString(v)[0]; + if (PyUnicode_Check(v) && PyUnicode_GetSize(v) == 1) { + *(char*)addr = PyUnicode_AsString(v)[0]; } else { PyErr_BadArgument();
