Mercurial > cpython-lru_cache-weakref
diff Python/traceback.c @ 47527:52294af4b663 legacy-trunk
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.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children | 4f804ee772eb |
line wrap: on
line diff
--- a/Python/traceback.c Mon Jun 09 01:28:30 2008 +0000 +++ b/Python/traceback.c Mon Jun 09 04:58:54 2008 +0000 @@ -155,12 +155,12 @@ PyErr_Clear(); break; } - if (PyBytes_Check(v)) { + if (PyString_Check(v)) { size_t len; - len = PyBytes_GET_SIZE(v); + len = PyString_GET_SIZE(v); if (len + 1 + taillen >= MAXPATHLEN) continue; /* Too long */ - strcpy(namebuf, PyBytes_AsString(v)); + strcpy(namebuf, PyString_AsString(v)); if (strlen(namebuf) != len) continue; /* v contains '\0' */ if (len > 0 && namebuf[len-1] != SEP) @@ -238,10 +238,10 @@ while (tb != NULL && err == 0) { if (depth <= limit) { err = tb_displayline(f, - PyBytes_AsString( + PyString_AsString( tb->tb_frame->f_code->co_filename), tb->tb_lineno, - PyBytes_AsString(tb->tb_frame->f_code->co_name)); + PyString_AsString(tb->tb_frame->f_code->co_name)); } depth--; tb = tb->tb_next;