diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-09 04:58:54 +0000 |
| commit | 134de0271f8611c6d4f4e53f3d45ee8eed65e3ab (patch) | |
| tree | 7b466b9d59bca636b4a061191382d3f72324a344 /PC/msvcrtmodule.c | |
| parent | 505f75b09d4cd430b69d02a07826d4510895d1e4 (diff) | |
| download | cpython-134de0271f8611c6d4f4e53f3d45ee8eed65e3ab.tar.gz | |
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 757d85ef43..e110ed8b09 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 * |