X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/a5ba0e8d7a47374c83d47ba84dc2935742effc27..569ec9b3fb04bdf26a41c73b2de3e406740c1906:/twitter/stream.py

diff --git a/twitter/stream.py b/twitter/stream.py
index 5ade0e5..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) or self.timeout:
+                if (not self.block or self.timeout) and (e.errno == 2):
                     # Apparently this means there was nothing in the socket buf
                     pass
                 else: