From 66b0234c8b307343635506adb0793a801adba5b4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 17 Nov 2015 23:49:08 +0530 Subject: [PATCH] ... --- src/calibre/utils/rapydscript.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py index 31a7eafa79..be9c738271 100644 --- a/src/calibre/utils/rapydscript.py +++ b/src/calibre/utils/rapydscript.py @@ -86,13 +86,16 @@ def compile_pyj(data, filename='', beautify=True, private_scope=True, lib ''' % json.dumps(filename)) if ok: return result - result = to_python(result) + presult = to_python(result) if 'message' in result: - msg = result['message'] - if 'filename' in result and 'line' in result: - msg = '%s:%s:%s' % (result['filename'], result['line'], msg) + msg = presult['message'] + if 'filename' in presult and 'line' in presult: + msg = '%s:%s:%s' % (presult['filename'], presult['line'], msg) raise CompileFailure(msg) - raise CompileFailure(repr(result)) + if result.stack: + # Javascript error object instead of ParseError + raise CompileFailure(result.stack) + raise CompileFailure(repr(presult)) def compile_srv(): d = os.path.dirname