X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/effd06bbbcddfac2783e4d028569ca9fad426216..40db782dcb9584b10a3307a5841c7e62780d60e4:/twitter/stream.py

diff --git a/twitter/stream.py b/twitter/stream.py
index 4e25c2a..83079d5 100644
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -59,7 +59,7 @@ class TwitterJSONIter(object):
                 else:
                     self.buf += sock.recv(1024)
             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: