OK, one more hack: speed up the case of readline() in unbuffered mode.

This is important IMO because httplib reads the headers this way.

diff --git a/Lib/socket.py b/Lib/socket.py
index 833a456b4fd0b310ad1a595771015302be73183d..0daeadcb3483b9a3974f19dd3493a1709b2ae739 100644 (file)
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -307,6 +307,17 @@ class _fileobject(object):
         data = self._rbuf
         if size < 0:
             # Read until \n or EOF, whichever comes first
+            if self._rbufsize <= 1:
+                # Speed up unbuffered case
+                assert data == ""
+                buffers = []
+                recv = self._sock.recv
+                while data != "\n":
+                    data = recv(1)
+                    if not data:
+                        break
+                    buffers.append(data)
+                return "".join(buffers)
             nl = data.find('\n')
             if nl >= 0:
                 nl += 1