Further simplification in progress.

diff --git a/twitter/stream.py b/twitter/stream.py
index 728b49d9e8efa90f58fc1ba0a2f0ba07028a0988..671a856f56be5f6a100e07b949bb4c153273a11f 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -19,36 +19,37 @@ Timeout = {'timeout': True}
 Hangup = {'hangup': True}
 HeartbeatTimeout = {'heartbeat_timeout': True, 'hangup': True}
 
-def recv_chunk(sock): # -> bytearray:
+class ChunkDecodeError(Exception):
+    pass
 
+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
+    if not crlf:
+        raise ChunkDecodeError()
 
-        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.
+    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.
 
-        if size <= 3:  # E.g. an HTTP chunk with just a keep-alive delimiter or end of stream (0).
-            chunk[:size] = header[start:start + size]
-        # There are several edge cases (size == [4-6]) as the chunk size exceeds the length
-        # of the initial read of 8 bytes. With Twitter, these do not, in practice, occur. The
-        # shortest JSON message starts with '{"limit":{'. Hence, it exceeds in size the edge cases
-        # and eliminates the need to address them.
-        else:  # There is more to read in the chunk.
-            end = len(header) - start
-            chunk[:end] = header[start:]
-            if PY_27_OR_HIGHER:  # 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.
+    if size <= 3:  # E.g. an HTTP chunk with just a keep-alive delimiter or end of stream (0).
+        chunk[:size] = header[start:start + size]
+    # There are several edge cases (size == [4-6]) as the chunk size exceeds the length
+    # of the initial read of 8 bytes. With Twitter, these do not, in practice, occur. The
+    # shortest JSON message starts with '{"limit":{'. Hence, it exceeds in size the edge cases
+    # and eliminates the need to address them.
+    else:  # There is more to read in the chunk.
+        end = len(header) - start
+        chunk[:end] = header[start:]
+        if PY_27_OR_HIGHER:  # 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()
+    return chunk
 
 
 class Timer(object):
@@ -94,9 +95,6 @@ class TwitterJSONIter(object):
         timer = Timer(self.timeout)
         heartbeat_timer = Timer(self.heartbeat_timeout)
         while True:
-            if buf:
-                heartbeat_timer.reset()
-
             buf = buf.lstrip() # Remove any keep-alive delimiters
             try:
                 res, ptr = raw_decode(buf)
@@ -117,15 +115,15 @@ class TwitterJSONIter(object):
                 yield Timeout
 
             try:
-                if not buf:
-                    if sock_timeout:
-                        ready_to_read = select.select([sock], [], [], sock_timeout)[0]
-                        if not ready_to_read:
-                            continue
-                    buf += recv_chunk(sock).decode('utf-8')
+                if not buf and sock_timeout:
+                    ready_to_read = select.select([sock], [], [], sock_timeout)[0]
+                    if not ready_to_read:
+                        continue
+                buf += recv_chunk(sock).decode('utf-8')
                 if not buf:
                     yield Hangup
                     break
+                heartbeat_timer.reset()
             except SSLError as e:
                 # Code 2 is error from a non-blocking read of an empty buffer.
                 if e.errno != 2: