Issue 4028 - Add support for Edge extensions to buildtools

packager.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/.
 
 # Note: These are the base functions common to all packagers, the actual
 # packagers are implemented in packagerGecko and packagerChrome.
 
 import sys
 import os
 import re
@@ skipping 26 matching lines @@
 
 
 def getBuildNum(baseDir):
     try:
         from buildtools.ensure_dependencies import Mercurial, Git
         if Mercurial().istype(baseDir):
             result = subprocess.check_output(['hg', 'id', '-R', baseDir, '-n'])
             return re.sub(r'\D', '', result)
         elif Git().istype(baseDir):
             result = subprocess.check_output(['git', 'rev-list', 'HEAD'], cwd=baseDir)
-            return len(result.splitlines())
+            return str(len(result.splitlines()))
     except subprocess.CalledProcessError:
         pass
 
     return '0'
 
 
 def getBuildVersion(baseDir, metadata, releaseBuild, buildNum=None):
     version = metadata.get('general', 'version')
     if not releaseBuild:
         if buildNum == None:
             buildNum = getBuildNum(baseDir)
         if len(buildNum) > 0:
             if re.search(r'(^|\.)\d+$', version):
                 # Numerical version number - need to fill up with zeros to have three
                 # version components.
                 while version.count('.') < 2:
                     version += '.0'
             version += '.' + buildNum
     return version
 
 
 def getTemplate(template, autoEscape=False):
     import jinja2
 
-    templatePath = os.path.join(buildtools.__path__[0], 'templates')

[Vasily Kuznetsov, 2016/06/13 12:57:31]

These changes are needed to move all templates into `templates` folder. Strictly
speaking this was not necessary to add Edge support but I didn't feel like
adding more stuff to an already overcrowded root directory of `buildtools`.

-    loader = jinja2.FileSystemLoader(templatePath)
+    template_path = os.path.join(buildtools.__path__[0], 'templates')
+    loader = jinja2.FileSystemLoader(template_path)
     if autoEscape:
         env = jinja2.Environment(loader=loader, autoescape=True)
     else:
         env = jinja2.Environment(loader=loader)
     env.filters.update({'json': json.dumps})
     return env.get_template(template)
 
 
 class Files(dict):
     def __init__(self, includedFiles, ignoredFiles, process=None):
@@ skipping 43 matching lines @@
 
     def preprocess(self, filenames, params={}):
         import jinja2
         env = jinja2.Environment()
 
         for filename in filenames:
             env.autoescape = os.path.splitext(filename)[1].lower() in ('.html', '.xml')
             template = env.from_string(self[filename].decode('utf-8'))
             self[filename] = template.render(params).encode('utf-8')
 
-    def zip(self, outFile, sortKey=None):
-        zip = zipfile.ZipFile(outFile, 'w', zipfile.ZIP_DEFLATED)
-        names = self.keys()
-        names.sort(key=sortKey)
-        for name in names:
-            zip.writestr(name, self[name])
-        zip.close()
+    def zip(self, outFile, sortKey=None, compression=zipfile.ZIP_DEFLATED):
+        with zipfile.ZipFile(outFile, 'w', compression) as zf:
+            for name in sorted(self, key=sortKey):
+                zf.writestr(name, self[name])
 
     def zipToString(self, sortKey=None):
         buffer = StringIO()
         self.zip(buffer, sortKey=sortKey)
         return buffer.getvalue()