diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-27 19:52:40 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-27 19:52:40 (GMT) |
| commit | 9acae51be2d9e17ecab3e174cb32dd05e1097c1f (patch) | |
| tree | 804def2df57a235a0bc64493fc0db860d429efcf | |
| parent | 43ffd5c01364748fbb8f8113195f32863c833a19 (diff) | |
| download | cpython-9acae51be2d9e17ecab3e174cb32dd05e1097c1f.zip cpython-9acae51be2d9e17ecab3e174cb32dd05e1097c1f.tar.gz cpython-9acae51be2d9e17ecab3e174cb32dd05e1097c1f.tar.bz2 | |
Merged revisions 85864 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85864 | antoine.pitrou | 2010-10-27 21:45:43 +0200 (mer., 27 oct. 2010) | 5 lines
In open(), only set the buffer size from st.st_blksize when it is greater
than 1. This matches the pure Python implementation in _pyio and should
fix a couple of failures on the NetBSD buildbot.
........
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 733a7b9..a1c451e 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -451,7 +451,7 @@ io_open(PyObject *self, PyObject *args, PyObject *kwds) if (fileno == -1 && PyErr_Occurred()) goto error; - if (fstat(fileno, &st) >= 0) + if (fstat(fileno, &st) >= 0 && st.st_blksize > 1) buffering = st.st_blksize; } #endif |