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/timemodule.c b/Modules/timemodule.c
index 92c47cb..c6f68f8 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -488,7 +488,7 @@
e.g. an empty format, or %Z when the timezone
is unknown. */
PyObject *ret;
- ret = PyBytes_FromStringAndSize(outbuf, buflen);
+ ret = PyString_FromStringAndSize(outbuf, buflen);
free(outbuf);
return ret;
}
@@ -548,7 +548,7 @@
p = asctime(&buf);
if (p[24] == '\n')
p[24] = '\0';
- return PyBytes_FromString(p);
+ return PyString_FromString(p);
}
PyDoc_STRVAR(asctime_doc,
@@ -584,7 +584,7 @@
}
if (p[24] == '\n')
p[24] = '\0';
- return PyBytes_FromString(p);
+ return PyString_FromString(p);
}
PyDoc_STRVAR(ctime_doc,