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/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index f466b91..261e8f1 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -2904,12 +2904,12 @@
PyObject *result;
if (lz->cnt != PY_SSIZE_T_MAX)
- return PyBytes_FromFormat("count(%zd)", lz->cnt);
+ return PyString_FromFormat("count(%zd)", lz->cnt);
cnt_repr = PyObject_Repr(lz->long_cnt);
if (cnt_repr == NULL)
return NULL;
- result = PyBytes_FromFormat("count(%s)", PyBytes_AS_STRING(cnt_repr));
+ result = PyString_FromFormat("count(%s)", PyString_AS_STRING(cnt_repr));
Py_DECREF(cnt_repr);
return result;
}
@@ -3221,11 +3221,11 @@
return NULL;
if (ro->cnt == -1)
- result = PyBytes_FromFormat("repeat(%s)",
- PyBytes_AS_STRING(objrepr));
+ result = PyString_FromFormat("repeat(%s)",
+ PyString_AS_STRING(objrepr));
else
- result = PyBytes_FromFormat("repeat(%s, %zd)",
- PyBytes_AS_STRING(objrepr), ro->cnt);
+ result = PyString_FromFormat("repeat(%s, %zd)",
+ PyString_AS_STRING(objrepr), ro->cnt);
Py_DECREF(objrepr);
return result;
}