Bug 1547730 - use six.iterkeys() r=#build
☠☠ backed out by ee4b88439111 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Tue, 16 Apr 2019 17:11:42 -0400
changeset 474137 042cdcc4e1031f6ca1270a85fc383cc40f8cb79c
parent 474136 81bc9014907e9394a12551147fbe564c12cb0766
child 474138 c846bf431b5c79ea08053f1fa9952ea6543d41d7
push id36023
push userncsoregi@mozilla.com
push dateThu, 16 May 2019 21:56:43 +0000
treeherdermozilla-central@786f094a30ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1547730
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1547730 - use six.iterkeys() r=#build Differential Revision: https://phabricator.services.mozilla.com/D28119
python/mozbuild/mozbuild/jar.py
python/mozbuild/mozpack/test/test_packager_formats.py
--- a/python/mozbuild/mozbuild/jar.py
+++ b/python/mozbuild/mozbuild/jar.py
@@ -9,16 +9,17 @@ See the documentation for jar.mn on MDC 
 '''
 
 from __future__ import absolute_import, print_function
 
 import sys
 import os
 import errno
 import re
+import six
 import logging
 from time import localtime
 from MozZipFile import ZipFile
 from cStringIO import StringIO
 
 from mozbuild.preprocessor import Preprocessor
 from mozbuild.action.buildlist import addEntriesToListFile
 from mozbuild.util import ensure_bytes
@@ -301,17 +302,17 @@ class JarMaker(object):
                                      self.rootManifestAppId)])
 
     def updateManifest(self, manifestPath, chromebasepath, register):
         '''updateManifest replaces the % in the chrome registration entries
         with the given chrome base path, and updates the given manifest file.
         '''
         myregister = dict.fromkeys(map(lambda s: s.replace('%',
                                                            chromebasepath), register))
-        addEntriesToListFile(manifestPath, myregister.iterkeys())
+        addEntriesToListFile(manifestPath, six.iterkeys(myregister))
 
     def makeJar(self, infile, jardir):
         '''makeJar is the main entry point to JarMaker.
 
         It takes the input file, the output directory, the source dirs and the
         top source dir as argument, and optionally the l10n dirs.
         '''
 
--- a/python/mozbuild/mozpack/test/test_packager_formats.py
+++ b/python/mozbuild/mozpack/test/test_packager_formats.py
@@ -229,17 +229,17 @@ RESULT_OMNIJAR.update({
         for p in chain((
             'chrome.manifest',
             'chrome/chrome.manifest',
             'chrome/foo/foo',
             'components/components.manifest',
             'components/foo.js',
         ), (
             mozpath.relpath(p, 'app')
-            for p in RESULT_FLAT.iterkeys()
+            for p in six.iterkeys(RESULT_FLAT)
             if p.startswith('app/chrome/addons/addon2/')
         ))
     },
     'app/chrome.manifest': [],
 })
 
 RESULT_OMNIJAR['omni.foo'].update({
     p: RESULT_FLAT[p]