Skip to content

Commit a515d28

Browse files
author
Matt George
committed
slight changes to the exception handling
changing exception handling formatting.
1 parent 79319c9 commit a515d28

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pyres/failure/base.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ def __init__(self, exp, queue, payload, worker=None):
1414

1515
def _parse_traceback(self, trace):
1616
"""Return the given traceback string formatted for a notification."""
17-
p_traceback = [ "%s:%d:in `%s'" % (filename, lineno, funcname)
18-
for filename, lineno, funcname, _
19-
in traceback.extract_tb(trace) ]
20-
p_traceback.reverse()
17+
reversed_backtrace = list(
18+
reversed(traceback.extract_tb(trace))
19+
)
20+
p_traceback = []
21+
for filename, lineno, funcname, text in reversed_backtrace:
22+
p_traceback.append("%s:%s:%d:in `%s`" % (text, filename, lineno, funcname))
23+
#p_traceback = [ "%s:%d:in `%s'" % (filename, lineno, funcname)
24+
# for filename, lineno, funcname, _
25+
# in traceback.extract_tb(trace) ]
26+
#p_traceback.reverse()
2127

2228
return p_traceback
2329

pyres/worker.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ def process(self, job=None):
138138
self.working_on(job)
139139
job.perform()
140140
except Exception, e:
141+
exceptionType, exceptionValue, exceptionTraceback = sys.exc_info()
141142
print "%s failed: %s" % (job, e)
142-
job.fail(e)
143+
job.fail(exceptionTraceback)
143144
self.failed()
144145
else:
145146
print "done: %s" % job

0 commit comments

Comments
 (0)