Noissue - Adapt best practices for trailing commas (buildtools)

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 glob
 import io
 import json
 import os
 import re
@@ skipping 46 matching lines @@
         if width != height:
             print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (filename, width, height)
         icons[width] = filename
     return icons
 
 
 def createScriptPage(params, template_name, script_option):
     template = getTemplate(template_name, autoEscape=True)
     return template.render(
         basename=params['metadata'].get('general', 'basename'),
-        scripts=params['metadata'].get(*script_option).split()
+        scripts=params['metadata'].get(*script_option).split(),
     ).encode('utf-8')
 
 
 def createManifest(params, files):
     template = getTemplate('manifest.json.tmpl')
     templateData = dict(params)
 
     baseDir = templateData['baseDir']
     metadata = templateData['metadata']
 
@@ skipping 59 matching lines @@
 
     metadata.serialize_section_if_present('manifest', data)
     manifest = json.dumps(data, sort_keys=True, indent=2)
 
     return manifest.encode('utf-8')
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
-        indent=2, separators=(',', ': ')
+        indent=2, separators=(',', ': '),
     ).encode('utf-8') + '\n'
 
 
 def create_bundles(params, files, bundle_tests):
     base_extension_path = params['baseDir']
     info_templates = {
         'chrome': 'chromeInfo.js.tmpl',
         'edge': 'edgeInfo.js.tmpl',
-        'gecko': 'geckoInfo.js.tmpl'
+        'gecko': 'geckoInfo.js.tmpl',
     }
 
     # Historically we didn't use relative paths when requiring modules, so in
     # order for webpack to know where to find them we need to pass in a list of
     # resolve paths. Going forward we should always use relative paths, once we
     # do that consistently this can be removed. See issues 5760, 5761 and 5762.
     resolve_paths = [os.path.join(base_extension_path, dir, 'lib')
                      for dir in ['', 'adblockpluscore', 'adblockplusui']]
 
     info_template = getTemplate(info_templates[params['type']])
     info_module = info_template.render(
         basename=params['metadata'].get('general', 'basename'),
-        version=params['version']
+        version=params['version'],
     ).encode('utf-8')
 
     configuration = {
         'bundles': [],
         'extension_path': base_extension_path,
         'info_module': info_module,
         'resolve_paths': resolve_paths,
     }
 
     for item in params['metadata'].items('bundles'):
         name, value = item
         base_item_path = os.path.dirname(item.source)
 
         bundle_file = os.path.relpath(os.path.join(base_item_path, name),
                                       base_extension_path)
         entry_files = [os.path.join(base_item_path, module_path)
                        for module_path in value.split()]
         configuration['bundles'].append({
             'bundle_name': bundle_file,
             'entry_points': entry_files,
         })
 
     if bundle_tests:
         qunit_path = os.path.join(base_extension_path, 'qunit')
         qunit_files = ([os.path.join(qunit_path, 'common.js')] +
                        glob.glob(os.path.join(qunit_path, 'tests', '*.js')))
         configuration['bundles'].append({
             'bundle_name': 'qunit/tests.js',
-            'entry_points': qunit_files
+            'entry_points': qunit_files,
         })
 
     cmd = ['node', os.path.join(os.path.dirname(__file__), 'webpack_runner.js')]
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                stdin=subprocess.PIPE)
     output = process.communicate(input=toJson(configuration))[0]
     if process.returncode != 0:
         raise subprocess.CalledProcessError(process.returncode, cmd=cmd)
     output = json.loads(output)
 
@@ skipping 123 matching lines @@
 
 def add_devenv_requirements(files, metadata, params):
     files.read(
         os.path.join(os.path.dirname(__file__), 'chromeDevenvPoller__.js'),
         relpath='devenvPoller__.js',
     )
     files['devenvVersion__'] = str(random.random())
 
     if metadata.has_option('general', 'testScripts'):
         files['qunit/index.html'] = createScriptPage(
-            params, 'testIndex.html.tmpl', ('general', 'testScripts')
+            params, 'testIndex.html.tmpl', ('general', 'testScripts'),
         )
 
 
 def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
     metadata = readMetadata(baseDir, type)
     version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
     if outFile == None:
         file_extension = get_extension(type, keyFile is not None)
         outFile = getDefaultFileName(metadata, version, file_extension)
@@ skipping 14 matching lines @@
     files.readMappedFiles(mapped)
     files.read(baseDir, skip=[opt for opt, _ in mapped])
 
     if metadata.has_section('bundles'):
         bundle_tests = devenv and metadata.has_option('general', 'testScripts')
         create_bundles(params, files, bundle_tests)
 
     if metadata.has_section('preprocess'):
         files.preprocess(
             [f for f, _ in metadata.items('preprocess')],
-            {'needsExt': True}
+            {'needsExt': True},
         )
 
     if metadata.has_section('import_locales'):
         import_locales(params, files)
 
     files['manifest.json'] = createManifest(params, files)
     if type == 'chrome':
         fix_translations_for_chrome(files)
 
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)