Mercurial > cpython-lru_cache-weakref
diff Python/structmember.c @ 47527:52294af4b663 legacy-trunk
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children | 96a2371b114b |
line wrap: on
line diff
--- a/Python/structmember.c Mon Jun 09 01:28:30 2008 +0000 +++ b/Python/structmember.c Mon Jun 09 04:58:54 2008 +0000 @@ -16,7 +16,7 @@ if (v != NULL) { for (i = 0; i < n; i++) PyList_SetItem(v, i, - PyBytes_FromString(mlist[i].name)); + PyString_FromString(mlist[i].name)); if (PyErr_Occurred()) { Py_DECREF(v); v = NULL; @@ -103,13 +103,13 @@ v = Py_None; } else - v = PyBytes_FromString(*(char**)addr); + v = PyString_FromString(*(char**)addr); break; case T_STRING_INPLACE: - v = PyBytes_FromString((char*)addr); + v = PyString_FromString((char*)addr); break; case T_CHAR: - v = PyBytes_FromStringAndSize((char*)addr, 1); + v = PyString_FromStringAndSize((char*)addr, 1); break; case T_OBJECT: v = *(PyObject **)addr; @@ -310,8 +310,8 @@ Py_XDECREF(oldv); break; case T_CHAR: - if (PyBytes_Check(v) && PyBytes_Size(v) == 1) { - *(char*)addr = PyBytes_AsString(v)[0]; + if (PyString_Check(v) && PyString_Size(v) == 1) { + *(char*)addr = PyString_AsString(v)[0]; } else { PyErr_BadArgument();