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/sliceobject.c b/Objects/sliceobject.c
index 75048e3..075418e 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -19,7 +19,7 @@
static PyObject *
ellipsis_repr(PyObject *op)
{
- return PyBytes_FromString("Ellipsis");
+ return PyString_FromString("Ellipsis");
}
static PyTypeObject PyEllipsis_Type = {
@@ -228,14 +228,14 @@
{
PyObject *s, *comma;
- s = PyBytes_FromString("slice(");
- comma = PyBytes_FromString(", ");
- PyBytes_ConcatAndDel(&s, PyObject_Repr(r->start));
- PyBytes_Concat(&s, comma);
- PyBytes_ConcatAndDel(&s, PyObject_Repr(r->stop));
- PyBytes_Concat(&s, comma);
- PyBytes_ConcatAndDel(&s, PyObject_Repr(r->step));
- PyBytes_ConcatAndDel(&s, PyBytes_FromString(")"));
+ s = PyString_FromString("slice(");
+ comma = PyString_FromString(", ");
+ PyString_ConcatAndDel(&s, PyObject_Repr(r->start));
+ PyString_Concat(&s, comma);
+ PyString_ConcatAndDel(&s, PyObject_Repr(r->stop));
+ PyString_Concat(&s, comma);
+ PyString_ConcatAndDel(&s, PyObject_Repr(r->step));
+ PyString_ConcatAndDel(&s, PyString_FromString(")"));
Py_DECREF(comma);
return s;
}