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 /PC/msvcrtmodule.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 'PC/msvcrtmodule.c')
-rwxr-xr-x | PC/msvcrtmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 757d85e..e110ed8 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -140,7 +140,7 @@ msvcrt_getch(PyObject *self, PyObject *args) ch = _getch(); Py_END_ALLOW_THREADS s[0] = ch; - return PyBytes_FromStringAndSize(s, 1); + return PyString_FromStringAndSize(s, 1); } static PyObject * @@ -172,7 +172,7 @@ msvcrt_getche(PyObject *self, PyObject *args) ch = _getche(); Py_END_ALLOW_THREADS s[0] = ch; - return PyBytes_FromStringAndSize(s, 1); + return PyString_FromStringAndSize(s, 1); } static PyObject * |