revert to regular no yield in timeout mode until further non-blocking+timeout option

diff --git a/twitter/stream.py b/twitter/stream.py
index a8ac54d1490bba6efee5721fcb9ee138c0b2a4ba..a0df98e61408583a13f5368ee0356a6cbab620fb 100644 (file)
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -70,7 +70,7 @@ class TwitterJSONIter(object):
                 yield wrap_response(res, self.handle.headers)
                 continue
             except ValueError as e:
-                if self.block and not self.timeout: pass
+                if self.block: pass
                 else: yield None
             try:
                 buf = buf.lstrip()  # Remove any keep-alive delimiters to detect hangups.