diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Python/structmember.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-git-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz | |
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.
Diffstat (limited to 'Python/structmember.c')
| -rw-r--r-- | Python/structmember.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/structmember.c b/Python/structmember.c index 5ebe28331f..d230590330 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -16,7 +16,7 @@ listmembers(struct memberlist *mlist) 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 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) 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 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) 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(); |