Merge branch 'add-exception-to-details'

Author: bgreen-litl

README.rst

@@ -288,7 +288,9 @@ In the case of the ``on_exception`` decorator, all ``on_backoff`` and
 ``on_giveup`` handlers are called from within the except block for the
 exception being handled. Therefore exception info is available to the
 handler functions via the python standard library, specifically
-``sys.exc_info()`` or the ``traceback`` module.
+``sys.exc_info()`` or the ``traceback`` module. The exception is also
+available at the *exception* key in the `details` dict passed to the
+handlers.
 
 Asynchronous code
 -----------------

backoff/_async.py

@@ -156,7 +156,7 @@ async def retry(*args, **kwargs):
                                      elapsed >= max_time_value)
 
                 if giveup_result or max_tries_exceeded or max_time_exceeded:
-                    await _call_handlers(on_giveup, **details)
+                    await _call_handlers(on_giveup, **details, exception=e)
                     if raise_on_giveup:
                         raise
                     return None
@@ -165,10 +165,11 @@ async def retry(*args, **kwargs):
                     seconds = _next_wait(wait, e, jitter, elapsed,
                                          max_time_value)
                 except StopIteration:
-                    await _call_handlers(on_giveup, **details)
+                    await _call_handlers(on_giveup, **details, exception=e)
                     raise e
 
-                await _call_handlers(on_backoff, **details, wait=seconds)
+                await _call_handlers(on_backoff, **details, wait=seconds,
+                                     exception=e)
 
                 # Note: there is no convenient way to pass explicit event
                 # loop to decorator, so here we assume that either default

backoff/_sync.py

@@ -109,7 +109,7 @@ def retry(*args, **kwargs):
                                      elapsed >= max_time_value)
 
                 if giveup(e) or max_tries_exceeded or max_time_exceeded:
-                    _call_handlers(on_giveup, **details)
+                    _call_handlers(on_giveup, **details, exception=e)
                     if raise_on_giveup:
                         raise
                     return None
@@ -118,10 +118,11 @@ def retry(*args, **kwargs):
                     seconds = _next_wait(wait, e, jitter, elapsed,
                                          max_time_value)
                 except StopIteration:
-                    _call_handlers(on_giveup, **details)
+                    _call_handlers(on_giveup, **details, exception=e)
                     raise e
 
-                _call_handlers(on_backoff, **details, wait=seconds)
+                _call_handlers(on_backoff, **details, wait=seconds,
+                               exception=e)
 
                 time.sleep(seconds)
             else:

tests/test_backoff.py

@@ -299,7 +299,9 @@ def succeeder(*args, **kwargs):
     for i in range(2):
         details = backoffs[i]
         elapsed = details.pop('elapsed')
+        exception = details.pop('exception')
         assert isinstance(elapsed, float)
+        assert isinstance(exception, ValueError)
         assert details == {'args': (1, 2, 3),
                            'kwargs': {'foo': 1, 'bar': 2},
                            'target': succeeder._target,
@@ -345,7 +347,9 @@ def exceptor(*args, **kwargs):
 
     details = giveups[0]
     elapsed = details.pop('elapsed')
+    exception = details.pop('exception')
     assert isinstance(elapsed, float)
+    assert isinstance(exception, ValueError)
     assert details == {'args': (1, 2, 3),
                        'kwargs': {'foo': 1, 'bar': 2},
                        'target': exceptor._target,
@@ -517,7 +521,9 @@ def succeeder(*args, **kwargs):
     for i in range(2):
         details = backoffs[i]
         elapsed = details.pop('elapsed')
+        exception = details.pop('exception')
         assert isinstance(elapsed, float)
+        assert isinstance(exception, ValueError)
         assert details == {'args': (1, 2, 3),
                            'kwargs': {'foo': 1, 'bar': 2},
                            'target': succeeder._target,

tests/test_backoff_async.py

@@ -255,7 +255,9 @@ async def succeeder(*args, **kwargs):
     for i in range(2):
         details = log['backoff'][i]
         elapsed = details.pop('elapsed')
+        exception = details.pop('exception')
         assert isinstance(elapsed, float)
+        assert isinstance(exception, ValueError)
         assert details == {'args': (1, 2, 3),
                            'kwargs': {'foo': 1, 'bar': 2},
                            'target': succeeder._target,
@@ -302,7 +304,9 @@ async def exceptor(*args, **kwargs):
 
     details = log['giveup'][0]
     elapsed = details.pop('elapsed')
+    exception = details.pop('exception')
     assert isinstance(elapsed, float)
+    assert isinstance(exception, ValueError)
     assert details == {'args': (1, 2, 3),
                        'kwargs': {'foo': 1, 'bar': 2},
                        'target': exceptor._target,
@@ -521,7 +525,9 @@ async def succeeder(*args, **kwargs):
     for i in range(2):
         details = log['backoff'][i]
         elapsed = details.pop('elapsed')
+        exception = details.pop('exception')
         assert isinstance(elapsed, float)
+        assert isinstance(exception, ValueError)
         assert details == {'args': (1, 2, 3),
                            'kwargs': {'foo': 1, 'bar': 2},
                            'target': succeeder._target,