From 2f2289a863c75118b93587053ceef084c4e5a38e Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 29 Mar 2016 21:16:30 +0800
Subject: [PATCH] bugfix

---
 jlog/log_api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jlog/log_api.py b/jlog/log_api.py
index c870869fa..ab596c01b 100644
--- 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