Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 67996:32386fa67a12 3.2
Merged revisions 88530 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88530 | victor.stinner | 2011-02-23 13:07:37 +0100 (mer., 23 févr. 2011) | 4 lines
Issue #11272: Fix input() and sys.stdin for Windows newline
On Windows, input() strips '\r' (and not only '\n'), and sys.stdin uses
universal newline (replace '\r\n' by '\n').
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Wed, 23 Feb 2011 12:10:23 +0000 |
| parents | 713c6b6ca5ce |
| children | 3c9232a684ae |
line wrap: on
line diff
--- a/Python/bltinmodule.c Wed Feb 23 11:52:31 2011 +0000 +++ b/Python/bltinmodule.c Wed Feb 23 12:10:23 2011 +0000 @@ -1621,6 +1621,7 @@ PyObject *stdin_encoding; char *stdin_encoding_str; PyObject *result; + size_t len; stdin_encoding = PyObject_GetAttrString(fin, "encoding"); if (!stdin_encoding) @@ -1685,19 +1686,23 @@ Py_DECREF(stdin_encoding); return NULL; } - if (*s == '\0') { + + len = strlen(s); + if (len == 0) { PyErr_SetNone(PyExc_EOFError); result = NULL; } - else { /* strip trailing '\n' */ - size_t len = strlen(s); + else { if (len > PY_SSIZE_T_MAX) { PyErr_SetString(PyExc_OverflowError, "input: input too long"); result = NULL; } else { - result = PyUnicode_Decode(s, len-1, stdin_encoding_str, NULL); + len--; /* strip trailing '\n' */ + if (len != 0 && s[len-1] == '\r') + len--; /* strip trailing '\r' */ + result = PyUnicode_Decode(s, len, stdin_encoding_str, NULL); } } Py_DECREF(stdin_encoding);