languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-15 21:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #10841: set binary mode on files; the parser translates newlines

Browse source 
On Windows, set the binary mode on stdin, stdout, stderr and all
io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python parser
translates newlines (\r\n => \n).
This commit is contained in:
Victor Stinner 2011-01-07 18:47:22 +00:00
parent bdde506116
commit 89e3436606
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -8,6 +8,10 @@ What's New in Python 3.2 Release Candidate 1
Core and Builtins
-----------------
- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and
all io.FileIO objects (to not translate newlines, \r\n <=> \n). The Python
parser translates newlines (\r\n => \n).
- Remove buffer API from stable ABI for now, see #10181.
- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file

5
Modules/_io/fileio.c
View file

@ -388,6 +388,11 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
goto error;
}
#if defined(MS_WINDOWS) || defined(__CYGWIN__)
/* don't translate newlines (\r\n <=> \n) */
_setmode(self->fd, O_BINARY);
#endif
if (PyObject_SetAttrString((PyObject *)self, "name", nameobj) < 0)
goto error;

9
Modules/main.c
View file

@ -527,11 +527,14 @@ Py_Main(int argc, wchar_t **argv)
stdin_is_interactive = Py_FdIsInteractive(stdin, (char *)0);
if (Py_UnbufferedStdioFlag) {
#if defined(MS_WINDOWS) || defined(__CYGWIN__)
_setmode(fileno(stdin), O_BINARY);
_setmode(fileno(stdout), O_BINARY);
/* don't translate newlines (\r\n <=> \n) */
_setmode(fileno(stdin), O_BINARY);
_setmode(fileno(stdout), O_BINARY);
_setmode(fileno(stderr), O_BINARY);
#endif
if (Py_UnbufferedStdioFlag) {
#ifdef HAVE_SETVBUF
setvbuf(stdin, (char *)NULL, _IONBF, BUFSIZ);
setvbuf(stdout, (char *)NULL, _IONBF, BUFSIZ);

7
Parser/tokenizer.c
View file

@ -892,6 +892,13 @@ tok_nextc(register struct tok_state *tok)
}
if (tok->prompt != NULL) {
char *newtok = PyOS_Readline(stdin, stdout, tok->prompt);
if (newtok != NULL) {
char *translated = translate_newlines(newtok, 0, tok);
PyMem_FREE(newtok);
if (translated == NULL)
return EOF;
newtok = translated;
}
#ifndef PGEN
if (tok->encoding && newtok && *newtok) {
/* Recode to UTF-8 */