Cosmetic edits.

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

diff --git a/twitter/stream.py b/twitter/stream.py
index 4e25c2a899199f12a2b0dc990d63b39c2ab5e5e6..41124dd145ca1e7d914047fd0720b94ed7ec82e6 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -17,12 +17,35 @@ class TwitterJSONIter(object):
     def __init__(self, handle, uri, arg_data, block=True, timeout=None):
         self.decoder = json.JSONDecoder()
         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:
+            crlf = buf.find(b'\r\n')  # Find the HTTP chunk size.
+            if crlf > 0:
+                remaining = int(buf[:crlf].decode(), 16)  # Decode the chunk size.
+                chunk = bytearray(buf[crlf + 2:])  # Create the chunk buffer.
+                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):
         if sys.version_info >= (3, 0):
             sock = self.handle.fp.raw._sock
@@ -44,26 +67,26 @@ class TwitterJSONIter(object):
                     pass
                 else:
                     yield None
-            except urllib_error.HTTPError as e:
-                raise TwitterHTTPError(e, uri, self.format, arg_data)
             # this is a non-blocking read (ie, it will return if any data is available)
             try:
                 if self.timeout:
                     ready_to_read = select.select([sock], [], [], self.timeout)
                     if ready_to_read[0]:
-                        self.buf += sock.recv(1024)
+                        self.buf += self.recv_chunk(sock)
                         if time.time() - self.timer > self.timeout:
                             yield {"timeout":True}
                     else:
                         yield {"timeout":True}
                 else:
-                    self.buf += sock.recv(1024)
+                    self.buf += self.recv_chunk(sock)
             except SSLError as e:
-                if (not self.block) and (e.errno == 2):
+                if (not self.block or self.timeout) and (e.errno == 2):
                     # Apparently this means there was nothing in the socket buf
                     pass
                 else:
                     raise
+            except urllib_error.HTTPError as e:
+                raise TwitterHTTPError(e, self.uri, 'json', self.arg_data)
 
 def handle_stream_response(req, uri, arg_data, block, timeout=None):
     handle = urllib_request.urlopen(req,)
@@ -119,4 +142,4 @@ class TwitterStream(TwitterStreamCall):
         TwitterStreamCall.__init__(
             self, auth=auth, format="json", domain=domain,
             callable_cls=call_cls,
-            secure=secure, uriparts=uriparts, timeout=timeout)
+            secure=secure, uriparts=uriparts, timeout=timeout, gzip=False)