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/timemodule.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/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ time_strftime(PyObject *self, PyObject *args) 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 @@ time_asctime(PyObject *self, PyObject *args) 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 @@ time_ctime(PyObject *self, PyObject *args) } if (p[24] == '\n') p[24] = '\0'; - return PyBytes_FromString(p); + return PyString_FromString(p); } PyDoc_STRVAR(ctime_doc, |