Use next() with default instead of confusing errback

kxz · Aug 5, 2015 · 8c77d9b · 8c77d9b
1 parent 0dcfcf2
commit 8c77d9b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/omnipresence/connection.py b/omnipresence/connection.py
@@ -499,9 +499,7 @@ def reply_from_buffer(self, request, reply_when_empty=False):
                         ' (+{} more characters)').format(remaining_chars)
             deferred = succeed(next_reply)
         else:  # assume an iterator
-            deferred = maybeDeferred(next, buf)
-            # Return None on StopIteration.  It looks weird, yes.
-            deferred.addErrback(lambda f: f.trap(StopIteration) and None)
+            deferred = maybeDeferred(next, buf, None)
         if reply_when_empty:
             deferred.addCallback(lambda s: s or 'No text in buffer.')
         deferred.addCallback(self.reply, request)