Merge pull request #203 from RouxRC/pr-fix-timeout

[z_archive/twitter.git] / twitter / stream.py

diff --git a/twitter/stream.py b/twitter/stream.py
index 95bbc41783d872d3067f76f4e239d0c0db004b0f..6ecc49ed760a54591477274c0c1517556900d04e 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -12,14 +12,15 @@ import sys, select, time
 
 from .api import TwitterCall, wrap_response, TwitterHTTPError
 
-def recv_chunk(sock):  # -> bytearray:
+python27_3 = sys.version_info >= (2, 7)
+def recv_chunk(sock): # -> bytearray:
 
     header = sock.recv(8)  # Scan for an up to 16MiB chunk size (0xffffff).
     crlf = header.find(b'\r\n')  # Find the HTTP chunk size.
 
     if crlf > 0:  # If there is a length, then process it
 
-        size = int(header[:crlf], 16)  # Decode the chunk size. Rarely exceeds 8KiB in size.
+        size = int(header[:crlf], 16)  # Decode the chunk size. Rarely exceeds 8KiB.
         chunk = bytearray(size)
         start = crlf + 2  # Add in the length of the header's CRLF pair.
 
@@ -32,16 +33,17 @@ def recv_chunk(sock):  # -> bytearray:
         else:  # There is more to read in the chunk.
             end = len(header) - start
             chunk[:end] = header[start:]
-            buffer = memoryview(chunk)[end:]  # Create a view into the bytearray to hold the rest of the chunk.
-            sock.recv_into(buffer)
+            if python27_3:  # When possible, use less memory by reading directly into the buffer.
+                buffer = memoryview(chunk)[end:]  # Create a view into the bytearray to hold the rest of the chunk.
+                sock.recv_into(buffer)
+            else:  # less efficient for python2.6 compatibility
+                chunk[end:] = sock.recv(max(0, size - end))
             sock.recv(2)  # Read the trailing CRLF pair. Throw it away.
 
         return chunk
 
     return bytearray()
 
-##  recv_chunk()
-
 
 class TwitterJSONIter(object):
 
@@ -66,23 +68,20 @@ class TwitterJSONIter(object):
                 res, ptr = json_decoder.raw_decode(buf)
                 buf = buf[ptr:]
                 yield wrap_response(res, self.handle.headers)
-                timer = time.time()
                 continue
             except ValueError as e:
                 if self.block: pass
                 else: yield None
             try:
                 buf = buf.lstrip()  # Remove any keep-alive delimiters to detect hangups.
-                if self.timeout:
+                if self.timeout and not buf:  # This is a non-blocking read.
                     ready_to_read = select.select([sock], [], [], self.timeout)
-                    if ready_to_read[0]:
-                        buf += recv_chunk(sock).decode('utf-8')  # This is a non-blocking read.
-                        if time.time() - timer > self.timeout:
-                            yield {'timeout': True}
-                    else: yield {'timeout': True}
-                else:
-                    buf += recv_chunk(sock).decode('utf-8')
-                if not buf and self.block:
+                    if not ready_to_read[0] and time.time() - timer > self.timeout:
+                        yield {'timeout': True}
+                        continue
+                timer = time.time()
+                buf += recv_chunk(sock).decode('utf-8')
+                if not buf:
                     yield {'hangup': True}
                     break
             except SSLError as e: