From 21431e85d505b9698c085c25cbf1b2997a352b85 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 19 Oct 2007 21:48:41 +0000 Subject: This is the uncontroversial half of patch 1263 by Thomas Lee: changes to codecs.c and structmember.c to use PyUnicode instead of PyString. --- Python/structmember.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Python/structmember.c') diff --git a/Python/structmember.c b/Python/structmember.c index 3eb72183a1..c4b7d80873 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -51,13 +51,13 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) 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 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) 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(); -- cgit v1.2.1