Issue 4375 - Updated jshydra dependency for Python 3 support

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import io
 import json
 import os
 import re
 from StringIO import StringIO
@@ skipping 125 matching lines @@
 
     return manifest.encode('utf-8')
 
 
 def createInfoModule(params):
     template = getTemplate('chromeInfo.js.tmpl')
     return template.render(params).encode('utf-8')
 
 
 def convertJS(params, files):
-    from jshydra.abp_rewrite import doRewrite
+    from jshydra.abp_rewrite import rewrite_js
 
     for item in params['metadata'].items('convert_js'):
         file, sources = item
         baseDir = os.path.dirname(item.source)
 
         # Make sure the file is inside an included directory
         if '/' in file and not files.isIncluded(file):
             continue
 
         sourceFiles = sources.split()
         args = []
         try:
             argsStart = sourceFiles.index('--arg')
             args = sourceFiles[argsStart + 1:]
             sourceFiles = sourceFiles[0:argsStart]
         except ValueError:
             pass
 
         # Source files of the conversion shouldn't be part of the build
         for sourceFile in sourceFiles:
             if sourceFile in files:
                 del files[sourceFile]
 
         sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
-        files[file] = doRewrite(sourceFiles, args)
+        files[file] = rewrite_js(['--arg', ' '.join(args)] + sourceFiles)
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
 def importGeckoLocales(params, files):
@@ skipping 203 matching lines @@
         files['qunit/index.html'] = createScriptPage(params, 'testIndex.html.tmpl',
                                                      ('general', 'testScripts'))
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)