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.
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

View file

@ -73,9 +73,9 @@ static PyObject *
cell_repr(PyCellObject *op)
{
if (op->ob_ref == NULL)
return PyBytes_FromFormat("<cell at %p: empty>", op);
return PyString_FromFormat("<cell at %p: empty>", op);
return PyBytes_FromFormat("<cell at %p: %.80s object at %p>",
return PyString_FromFormat("<cell at %p: %.80s object at %p>",
op, op->ob_ref->ob_type->tp_name,
op->ob_ref);
}