Issue 4047 - Improved configuration of converted JS files

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 129 matching lines @@
 
 def createInfoModule(params):
     template = getTemplate('chromeInfo.js.tmpl')
     return template.render(params).encode('utf-8')
 
 
 def convertJS(params, files):
     from jshydra.abp_rewrite import rewrite_js
 
     output_files = collections.OrderedDict()
-    args = collections.defaultdict(lambda: [])

[Vasily Kuznetsov, 2016/08/30 14:13:52]

This could be `collections.defaultdict(list)`.

[Sebastian Noack, 2016/08/30 14:23:06]

Done.

+    args = collections.defaultdict(list)
 
     for item in params['metadata'].items('convert_js'):
         filename, arg = re.search(r'^(.*?)(?:\[(.*)\])?$', item[0]).groups()
         if arg is None:
             output_files[filename] = (item[1].split(), item.source)
         else:
             args[filename].append('{}={}'.format(arg, item[1]))
 
     for filename, (input_files, origin) in output_files.iteritems():
         if '/' in filename and not files.isIncluded(filename):
@@ skipping 223 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)