diff options
Diffstat (limited to 'python2/futures/_base.py')
-rw-r--r-- | python2/futures/_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python2/futures/_base.py b/python2/futures/_base.py index daa4049..8d0841e 100644 --- a/python2/futures/_base.py +++ b/python2/futures/_base.py @@ -512,14 +512,14 @@ class Executor(object): yield future.result() else: yield future.result(end_time - time.time()) - except: + except Exception, e: # Python 2.4 and earlier didn't allow yield statements in # try/finally blocks try: fs.cancel(timeout=0) except TimeoutError: pass - raise + raise e def map(self, func, *iterables, **kwargs): """Returns a iterator equivalent to map(fn, iter). |