Merged revisions 85864 via svnmerge from

pitrou · pitrou · commit 9acae51be2d9 · 2010-10-27T19:52:40.000Z
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.
........
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ io_open(PyObject self, PyObject args, PyObject *kwds)`
`451`	`451`	`if (fileno == -1 && PyErr_Occurred())`
`452`	`452`	`goto error;`
`453`	`453`
`454`		`- if (fstat(fileno, &st) >= 0)`
	`454`	`+ if (fstat(fileno, &st) >= 0 && st.st_blksize > 1)`
`455`	`455`	`buffering = st.st_blksize;`
`456`	`456`	`}`
`457`	`457`	`#endif`