mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #11272: Fix input() and sys.stdin for Windows newline

Browse source 
On Windows, input() strips '\r' (and not only '\n'), and sys.stdin uses
universal newline (replace '\r\n' by '\n').
This commit is contained in:
Victor Stinner 2011-02-23 12:07:37 +00:00
parent dd071045e7
commit c0f1a1afae
4 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Python/bltinmodule.c
View file

@ -1618,6 +1618,7 @@ builtin_input(PyObject *self, PyObject *args)
PyObject *stdin_encoding;
char *stdin_encoding_str;
PyObject *result;
size_t len;
stdin_encoding = PyObject_GetAttrString(fin, "encoding");
if (!stdin_encoding)
@ -1682,19 +1683,23 @@ builtin_input(PyObject *self, PyObject *args)
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);

11
Python/pythonrun.c
View file

@ -778,6 +778,7 @@ create_stdio(PyObject* io,
{
PyObject *buf = NULL, *stream = NULL, *text = NULL, *raw = NULL, *res;
const char* mode;
const char* newline;
PyObject *line_buffering;
int buffering, isatty;
@ -828,9 +829,17 @@ create_stdio(PyObject* io,
Py_CLEAR(raw);
Py_CLEAR(text);
newline = "\n";
#ifdef MS_WINDOWS
if (!write_mode) {
/* translate \r\n to \n for sys.stdin on Windows */
newline = NULL;
}
#endif
stream = PyObject_CallMethod(io, "TextIOWrapper", "OsssO",
buf, encoding, errors,
"\n", line_buffering);
newline, line_buffering);
Py_CLEAR(buf);
if (stream == NULL)
goto error;