Issue 4373 - Made jshydra compatible with Python 3

abp_rewrite.py

Index: abp_rewrite.py
===================================================================
old mode 100755
new mode 100644
--- a/abp_rewrite.py
+++ b/abp_rewrite.py
@@ -1,34 +1,20 @@
-#!/usr/bin/env python
-# coding: utf-8
-
 # This Source Code is subject to the terms of the Mozilla Public License
 # version 2.0 (the "License"). You can obtain a copy of the License at
 # http://mozilla.org/MPL/2.0/.
 
-import sys
 import os
 import subprocess
+
 import utils
 
 
-def doRewrite(files, args):
-    application = utils.ensureJSShell()
+def rewrite_js(args, script=None):
+    jsshell = utils.ensureJSShell()
+    env = {'LD_LIBRARY_PATH': os.path.relpath(os.path.dirname(jsshell))}
+    base_dir = os.path.dirname(__file__)
 
-    env = {
-        'LD_LIBRARY_PATH': os.path.relpath(os.path.dirname(application)),
-    }
+    if not script:
+        script = os.path.join(base_dir, 'scripts', 'abprewrite.js')
 
-    baseDir = os.path.dirname(utils.__file__)
-    command = [
-        application, os.path.join(baseDir, 'jshydra.js'),
-        os.path.join(baseDir, 'scripts', 'abprewrite.js'),
-        '--arg', ' '.join(args)
-    ] + files
-    return subprocess.check_output(command, env=env).replace('\r', '')
-
-if __name__ == '__main__':
-    try:
-        scriptArgsStart = sys.argv.index('--arg')
-    except ValueError:
-        scriptArgsStart = len(sys.argv)
-    print doRewrite(sys.argv[1:scriptArgsStart], sys.argv[scriptArgsStart + 1:])
+    command = [jsshell, os.path.join(base_dir, 'jshydra.js'), script] + args
+    return subprocess.check_output(command, env=env, universal_newlines=True)