Merge pull request #126 from spyoungtech/master

imap behavior more consistent with map behavior

Author: spyoungtech

AUTHORS.rst

@@ -9,3 +9,4 @@ Development Lead
 Patches and Suggestions
 ```````````````````````
 - Kracekumar <me@kracekumar.com>
+- Spencer Young <spencer.young@spyoung.com>

grequests.py

@@ -148,6 +148,8 @@ def send(r):
         if request.response is not None:
             yield request.response
         elif exception_handler:
-            exception_handler(request, request.exception)
+            ex_result = exception_handler(request, request.exception)
+            if ex_result is not None:
+                yield ex_result
 
     pool.join()

tests.py

@@ -179,29 +179,18 @@ def exception_handler(request, exception):
             out.append(r)
         self.assertEquals(out, [])
 
-    def test_imap_timeout_exception_handler_returns_false(self):
-        """
-        ensure map-compatible behaviour for a handler that returns False
-        """
-        def exception_handler(request, exception):
-            return False
-        reqs = [grequests.get(httpbin('delay/1'), timeout=0.001)]
-        out = []
-        for r in grequests.imap(reqs, exception_handler=exception_handler):
-            out.append(r)
-        self.assertEquals(out, [])
 
     def test_imap_timeout_exception_handler_returns_value(self):
         """
         ensure behaviour for a handler that returns a value
         """
         def exception_handler(request, exception):
-            return request
+            return 'a value'
         reqs = [grequests.get(httpbin('delay/1'), timeout=0.001)]
         out = []
         for r in grequests.imap(reqs, exception_handler=exception_handler):
             out.append(r)
-        self.assertEquals(out, [])
+        self.assertEquals(out, ['a value'])
 
     def test_map_timeout_exception(self):
         class ExceptionHandler: