Merge pull request #238 from dpkp/simple_consumer_get_messages_timeout

Fix SimpleConsumer timeout behavior in get_messages (Issue 237)

1 files changed, 5 insertions, 4 deletions

diff --git a/kafka/consumer/simple.py b/kafka/consumer/simple.py
index dcc71a9..aa4d752 100644
--- a/kafka/consumer/simple.py
+++ b/kafka/consumer/simple.py
@@ -207,10 +207,11 @@ class SimpleConsumer(Consumer):
                 if not block:
                     # If we're not blocking, break.
                     break
-                if timeout is not None:
-                    # If we're blocking and have a timeout, reduce it to the
-                    # appropriate value
-                    timeout = max_time - time.time()
+
+            # If we have a timeout, reduce it to the
+            # appropriate value
+            if timeout is not None:
+                timeout = max_time - time.time()
 
         # Update and commit offsets if necessary
         self.offsets.update(new_offsets)