[Python-checkins] r85865 - in python/branches/release31-maint: Modules/_io/_iomodule.c

Wed Oct 27 21:52:41 CEST 2010

Author: antoine.pitrou
Date: Wed Oct 27 21:52:40 2010
New Revision: 85865
Log:
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.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Modules/_io/_iomodule.c
Modified: python/branches/release31-maint/Modules/_io/_iomodule.c
==============================================================================

--- python/branches/release31-maint/Modules/_io/_iomodule.c	(original)
+++ python/branches/release31-maint/Modules/_io/_iomodule.c	Wed Oct 27 21:52:40 2010
@@ -451,7 +451,7 @@
 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
