Move variables out of the iterator class and into the generator function. This slight...

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

diff --git a/twitter/stream.py b/twitter/stream.py
index 10af6532d5c380d2f8824773298a8f0e82f9c706..fa332cf18148bba01af8d71970c0dccc6bd46afb 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -12,6 +12,28 @@ import sys, select, time
 
 from .api import TwitterCall, wrap_response, TwitterHTTPError
 
+def recv_chunk(sock):
+    buf = sock.recv(10)  # Scan for an up to a 4GiB chunk size (0xffffffff).
+    if buf:
+        crlf = buf.find(b'\r\n')  # Find the HTTP chunk size.
+        if crlf > 0:
+            remaining = int(buf[:crlf], 16)  # Decode the chunk size.
+            chunk = bytearray(remaining)  # Create the chunk buffer.
+
+            start = crlf + 2  # Add in the length of the header's CRLF pair.
+            end = len(buf) - start
+
+            chunk[:end] = buf[start:]
+            chunk[end:] = sock.recv(remaining - end)
+
+            sock.recv(2)  # Read the trailing CRLF pair. Throw it away.
+
+            return chunk
+    return b''
+
+##  recv_chunk()
+
+
 class TwitterJSONIter(object):
 
     def __init__(self, handle, uri, arg_data, block=True, timeout=None):
@@ -19,32 +41,8 @@ class TwitterJSONIter(object):
         self.handle = handle
         self.uri = uri
         self.arg_data = arg_data
-        self.buf = b""
         self.block = block
         self.timeout = timeout
-        self.timer = time.time()
-
-
-    def recv_chunk(self, sock):
-        buf = sock.recv(32)
-        if buf:
-            # Find the HTTP chunk size.
-            crlf = buf.find(b'\r\n')
-            if crlf > 0:
-                remaining = int(buf[:crlf].decode(), 16)  # Decode the chunk size.
-                chunk = bytearray(buf[crlf + 2:])  # Add the length of the length header CRLF pair.
-                remaining -= len(chunk)
-
-                while remaining > 0:
-                    balance = sock.recv(remaining + 2)  # Add the length of the chunk's CRLF pair.
-                    if balance:
-                        chunk.extend(balance)
-                        remaining -= len(balance)
-                # If possible, remove the trailing CRLF pair. (This precludes an extra trip through the JSON parser.)
-                if remaining == -2 and chunk[-2] == 0x0d and chunk[-1] == 0x0a:
-                    del chunk[-2:]
-                return chunk
-        return b''
 
 
     def __iter__(self):
@@ -55,13 +53,15 @@ class TwitterJSONIter(object):
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
         if not self.block or self.timeout:
             sock.setblocking(False)
+        buf = b''
+        timer = time.time()
         while True:
             try:
-                utf8_buf = self.buf.decode('utf8').lstrip()
+                utf8_buf = buf.decode('utf-8').lstrip()
                 res, ptr = self.decoder.raw_decode(utf8_buf)
-                self.buf = utf8_buf[ptr:].encode('utf8')
+                buf = utf8_buf[ptr:].encode('utf-8')
                 yield wrap_response(res, self.handle.headers)
-                self.timer = time.time()
+                timer = time.time()
                 continue
             except ValueError as e:
                 if self.block:
@@ -73,13 +73,13 @@ class TwitterJSONIter(object):
                 if self.timeout:
                     ready_to_read = select.select([sock], [], [], self.timeout)
                     if ready_to_read[0]:
-                        self.buf += self.recv_chunk(sock)
-                        if time.time() - self.timer > self.timeout:
+                        buf += recv_chunk(sock)
+                        if time.time() - timer > self.timeout:
                             yield {"timeout":True}
                     else:
                         yield {"timeout":True}
                 else:
-                    self.buf += self.recv_chunk(sock)
+                    buf += recv_chunk(sock)
             except SSLError as e:
                 if (not self.block or self.timeout) and (e.errno == 2):
                     # Apparently this means there was nothing in the socket buf