mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

This reverts r63675 based on the discussion in this thread:

Browse source 
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.
This commit is contained in:
Gregory P. Smith 2008-06-09 04:58:54 +00:00
parent e98839a1f4
commit dd96db63f6
173 changed files with 2275 additions and 2280 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/structmember.c
View file

@ -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();