bugfix

2016-03-29 21:16:30 +08:00 · 2016-03-29 21:16:30 +08:00 · 2f2289a863
parent e07305ef46
commit 2f2289a863
1 changed files with 4 additions and 1 deletions
--- a/jlog/log_api.py
+++ b/jlog/log_api.py
@ -90,7 +90,10 @@ def renderJSON(script_path, time_file_path):
                offset = 0
                for t in timing:
                    dt = scriptf.read(t[1])
-                    data = escapeString(dt)
+                    try:
+                        data = dt.encode('unicode_escape').decode('utf-8', 'ignore')
+                    except (UnicodeEncodeError, UnicodeDecodeError):
+                        data = dt.decode('utf-8', 'ignore')
                    # print ('###### (%s, %s)' % (t[1], repr(data)))
                    offset += t[0]
                    ret[str(offset/float(1000))] = data