Skip to content

Commit 2eee94d

Browse files
committed
More unicode fixes
1 parent 41f79f7 commit 2eee94d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

resources/lib/tasks/taskPython.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ def run(self):
131131
except Exception:
132132
e = sys.exc_info()[0]
133133
err = True
134+
msg = u''
134135
if hasattr(e, 'message'):
135-
msg = str(e.message)
136-
msg = msg + '\n' + traceback.format_exc()
137-
136+
msg += unicode(e.message) + u'\n'
137+
msg += unicode(e) + u'\n'
138+
tb = traceback.format_exc()
139+
msg += tb.decode('utf-8')
138140
self.threadReturn(err, msg)

resources/lib/tasks/taskScript.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def run(self):
182182
err = True
183183
if hasattr(e, 'message'):
184184
msg = unicode(e.message)
185-
msg = msg + u'\n' + unicode(traceback.format_exc())
185+
msg = msg + u'\n' +traceback.format_exc().decode('utf-8')
186186
finally:
187187
os.chdir(cwd)
188188
self.threadReturn(err, msg)

0 commit comments

Comments
 (0)