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/Python/traceback.c b/Python/traceback.c
index adf9a53..a481963 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -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;