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.
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 7cf5e62..fcc174e 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -15,8 +15,8 @@
static char *
descr_name(PyDescrObject *descr)
{
- if (descr->d_name != NULL && PyBytes_Check(descr->d_name))
- return PyBytes_AS_STRING(descr->d_name);
+ if (descr->d_name != NULL && PyString_Check(descr->d_name))
+ return PyString_AS_STRING(descr->d_name);
else
return "?";
}
@@ -24,7 +24,7 @@
static PyObject *
descr_repr(PyDescrObject *descr, char *format)
{
- return PyBytes_FromFormat(format, descr_name(descr),
+ return PyString_FromFormat(format, descr_name(descr),
descr->d_type->tp_name);
}
@@ -314,7 +314,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(descr->d_method->ml_doc);
+ return PyString_FromString(descr->d_method->ml_doc);
}
static PyMemberDef descr_members[] = {
@@ -335,7 +335,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(descr->d_member->doc);
+ return PyString_FromString(descr->d_member->doc);
}
static PyGetSetDef member_getset[] = {
@@ -350,7 +350,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(descr->d_getset->doc);
+ return PyString_FromString(descr->d_getset->doc);
}
static PyGetSetDef getset_getset[] = {
@@ -365,7 +365,7 @@
Py_INCREF(Py_None);
return Py_None;
}
- return PyBytes_FromString(descr->d_base->doc);
+ return PyString_FromString(descr->d_base->doc);
}
static PyGetSetDef wrapperdescr_getset[] = {
@@ -576,7 +576,7 @@
if (descr != NULL) {
Py_XINCREF(type);
descr->d_type = type;
- descr->d_name = PyBytes_InternFromString(name);
+ descr->d_name = PyString_InternFromString(name);
if (descr->d_name == NULL) {
Py_DECREF(descr);
descr = NULL;
@@ -922,7 +922,7 @@
static PyObject *
wrapper_repr(wrapperobject *wp)
{
- return PyBytes_FromFormat("<method-wrapper '%s' of %s object at %p>",
+ return PyString_FromFormat("<method-wrapper '%s' of %s object at %p>",
wp->descr->d_base->name,
wp->self->ob_type->tp_name,
wp->self);
@@ -947,7 +947,7 @@
{
char *s = wp->descr->d_base->name;
- return PyBytes_FromString(s);
+ return PyString_FromString(s);
}
static PyObject *
@@ -960,7 +960,7 @@
return Py_None;
}
else {
- return PyBytes_FromString(s);
+ return PyString_FromString(s);
}
}