"Unbuffered" mode of class _fileobject wasn't actually unbuffered,

and this broke a Zope "pipelining" test which read multiple responses
from the same connection (this attaches a new file object to the
socket for each response).  Added a test for this too.

(I want to do some code cleanup too, but I thought I'd first fix
the problem with as little code as possible, and add a unit test
for this case.  So that's what this checkin is about.)

1 files changed, 5 insertions, 2 deletions

diff --git a/Lib/socket.py b/Lib/socket.py
index 515d477..e59e6d9 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -174,11 +174,14 @@ class _socketobject:
 class _fileobject:
     """Implements a file object on top of a regular socket object."""
 
-    def __init__(self, sock, mode='rb', bufsize=8192):
+    def __init__(self, sock, mode='rb', bufsize=-1):
         self._sock = sock
         self._mode = mode
         if bufsize <= 0:
-            bufsize = 512
+	    if bufsize == 0:
+	        bufsize = 1 # Unbuffered mode
+	    else:
+                bufsize = 8192
         self._rbufsize = bufsize
         self._wbufsize = bufsize
         self._rbuf = [ ]