Issue 3516 - Add support for optional permissions

packagerChrome.py

 # coding: utf-8
 
 # 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 sys
 import os
 import re
 import json
@@ skipping 75 matching lines @@
       # ... = icon.png popup.html
       icon, popup = icons
     else:
       # ... = icon-19.png icon-38.png popup.html
       popup = icons.pop()
       icon = makeIcons(files, icons)
 
     templateData[opt] = {'icon': icon, 'popup': popup}
 
   if metadata.has_option('general', 'icons'):
-    templateData['icons'] = makeIcons(files, metadata.get('general', 'icons').split())
+    templateData['icons'] = makeIcons(files,
+                                      metadata.get('general', 'icons').split())
 
   if metadata.has_option('general', 'permissions'):
-    templateData['permissions'] = re.split(r'\s+', metadata.get('general', 'permissions'))
+    templateData['permissions'] = metadata.get('general', 'permissions').split()
     if params['experimentalAPI']:
       templateData['permissions'].append('experimental')
 
   if metadata.has_option('general', 'optionalPermissions'):
-    templateData['optionalPermissions'] = re.split(

[Sebastian Noack, 2016/01/14 16:26:11]

Note that re.split(r'\s+', s) is equivalent to s.split()

[kzar, 2016/01/14 16:39:07]

I know, just staying consistent with the surrounding code. Prefer I change it?

[Sebastian Noack, 2016/01/14 16:41:54]

Feel free to change it in the other places as well.

-      r'\s+', metadata.get('general', 'optionalPermissions')
-    )
+    templateData['optionalPermissions'] = metadata.get(
+      'general', 'optionalPermissions').split()
 
   if metadata.has_option('general', 'backgroundScripts'):
-    templateData['backgroundScripts'] = re.split(r'\s+', metadata.get('general', 'backgroundScripts'))
+    templateData['backgroundScripts'] = metadata.get(
+      'general', 'backgroundScripts').split()
     if params['devenv']:
       templateData['backgroundScripts'].append('devenvPoller__.js')
 
   if metadata.has_option('general', 'webAccessible') and metadata.get('general', 'webAccessible') != '':
-    templateData['webAccessible'] = re.split(r'\s+', metadata.get('general', 'webAccessible'))
+    templateData['webAccessible'] = metadata.get('general',
+                                                 'webAccessible').split()
 
   if metadata.has_section('contentScripts'):
     contentScripts = []
     for run_at, scripts in metadata.items('contentScripts'):
       if scripts == '':
         continue
       contentScripts.append({
         'matches': ['http://*/*', 'https://*/*'],
-        'js': re.split(r'\s+', scripts),
+        'js': scripts.split(),
         'run_at': run_at,
         'all_frames': True,
         'match_about_blank': True,
       })
     templateData['contentScripts'] = contentScripts
 
   manifest = template.render(templateData)
 
   # Normalize JSON structure
   licenseComment = re.compile(r'/\*.*?\*/', re.S)
@@ skipping 12 matching lines @@
   from jshydra.abp_rewrite import doRewrite
 
   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 = re.split(r'\s+', sources)
+    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:
@@ skipping 53 matching lines @@
           sourceData = localeTools.readFile(sourceFile)
 
         # Resolve wildcard imports
         if keys == '*' or keys == '=*':
           importList = sourceData.keys()
           importList = filter(lambda k: not k.startswith('_'), importList)
           if keys == '=*':
             importList = map(lambda k: '=' + k, importList)
           keys = ' '.join(importList)
 
-        for stringID in re.split(r'\s+', keys):
+        for stringID in keys.split():
           noMangling = False
           if stringID.startswith('='):
             stringID = stringID[1:]
             noMangling = True
 
           if stringID in sourceData:
             if noMangling:
               key = re.sub(r'\W', '_', stringID)
             else:
               key = re.sub(r'\..*', '', parts[-1]) + '_' + re.sub(r'\W', '_', stringID)
@@ skipping 117 matching lines @@
   if type == 'chrome':
     fixTranslationsForCWS(files)
 
   if devenv:
     import buildtools
     import random
     files.read(os.path.join(buildtools.__path__[0], 'chromeDevenvPoller__.js'), relpath='devenvPoller__.js')
     files['devenvVersion__'] = str(random.random())
 
   if (metadata.has_option('general', 'backgroundScripts') and
-      'lib/info.js' in re.split(r'\s+', metadata.get('general', 'backgroundScripts')) and
+      'lib/info.js' in metadata.get('general', 'backgroundScripts').split() and
       'lib/info.js' not in files):
     files['lib/info.js'] = createInfoModule(params)
 
   if metadata.has_option('general', 'testScripts'):
     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)