Merge pull request #178 from dkanygin/master

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

diff --git a/twitter/stream.py b/twitter/stream.py
index 5ade0e5ca6ac788fd779a09683ea7aa8c2e76077..83079d5779d7b532fe1e2a1f22f20912df805874 100644 (file)
--- 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: