diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-26 12:51:38 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-26 12:51:38 +0000 |
| commit | 593daf545bd9b7e7bcb27b498ecc6f36db9ae395 (patch) | |
| tree | c0a57029b9ab0eb18a2bb4f8fd65f0817f1a1707 /Python/structmember.c | |
| parent | c3cb683d638e9d660c18a05293a576f98965166e (diff) | |
| download | cpython-git-593daf545bd9b7e7bcb27b498ecc6f36db9ae395.tar.gz | |
Renamed PyString to PyBytes
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 d230590330..5ebe28331f 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, - PyString_FromString(mlist[i].name)); + PyBytes_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 = PyString_FromString(*(char**)addr); + v = PyBytes_FromString(*(char**)addr); break; case T_STRING_INPLACE: - v = PyString_FromString((char*)addr); + v = PyBytes_FromString((char*)addr); break; case T_CHAR: - v = PyString_FromStringAndSize((char*)addr, 1); + v = PyBytes_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 (PyString_Check(v) && PyString_Size(v) == 1) { - *(char*)addr = PyString_AsString(v)[0]; + if (PyBytes_Check(v) && PyBytes_Size(v) == 1) { + *(char*)addr = PyBytes_AsString(v)[0]; } else { PyErr_BadArgument(); |