diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 (GMT) |
| commit | dd96db63f689e2f0d8ae5a1436b3b3395eec7de5 (patch) | |
| tree | b2299acac9ce44fc488fc7b2ae2a44548cd5fbb8 /Modules/itertoolsmodule.c | |
| parent | e98839a1f48b2915f1cc747884e64f4d6e4c8e7a (diff) | |
| download | cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.zip cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.gz cpython-dd96db63f689e2f0d8ae5a1436b3b3395eec7de5.tar.bz2 | |
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.
Diffstat (limited to 'Modules/itertoolsmodule.c')
| -rw-r--r-- | Modules/itertoolsmodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ count_repr(countobject *lz) 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 @@ repeat_repr(repeatobject *ro) 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; } |