Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1547730 - Do six.itervalues instead of dict.itervalues r=#build

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D28104

--HG--
extra : rebase_source : e1537e9276e7253e97fac83c08fa0c1553dce7b9
extra : intermediate-source : 0415061eb0785b51d8003028dff21108d88cd86a
extra : source : 2ddb030c673d7d643d3b8151472d35d9d9c55ccd
This commit is contained in:
Justin Wood 2019-04-15 13:47:38 -04:00
parent 91e37fa7ff
commit 6dbc4a2979
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/mozbuild/mozbuild/configure/__init__.py
View File

@ -435,7 +435,7 @@ class ConfigureSandbox(dict):
if path:
self.include_file(path)
for option in self._options.itervalues():
for option in six.itervalues(self._options):
# All options must be referenced by some @depends function
if option not in self._seen:
raise ConfigureError(

2
python/mozbuild/mozbuild/configure/options.py
View File

@ -519,5 +519,5 @@ class CommandLineHelper(object):
def __iter__(self):
for d in (self._args, self._extra_args):
for arg, pos in d.itervalues():
for arg, pos in six.itervalues(d):
yield arg

14
python/mozbuild/mozpack/mozjar.py
View File

@ -75,7 +75,7 @@ class JarStruct(object):
an instance with empty fields.
'''
assert self.MAGIC and isinstance(self.STRUCT, OrderedDict)
self.size_fields = set(t for t in self.STRUCT.itervalues()
self.size_fields = set(t for t in six.itervalues(self.STRUCT)
if t not in JarStruct.TYPE_MAPPING)
self._values = {}
if data:
@ -381,7 +381,7 @@ class JarReader(object):
entries = self.entries
if not entries:
return JAR_STORED
return max(f['compression'] for f in entries.itervalues())
return max(f['compression'] for f in six.itervalues(entries))
@property
def entries(self):
@ -459,7 +459,7 @@ class JarReader(object):
for file in jarReader:
...
'''
for entry in self.entries.itervalues():
for entry in six.itervalues(self.entries):
yield self._getreader(entry)
def __getitem__(self, name):
@ -553,7 +553,7 @@ class JarWriter(object):
headers = {}
preload_size = 0
# Prepare central directory entries
for entry, content in self._contents.itervalues():
for entry, content in six.itervalues(self._contents):
header = JarLocalFileHeader()
for name in entry.STRUCT:
if name in header:
@ -576,18 +576,18 @@ class JarWriter(object):
offset = end['cdir_size'] + end['cdir_offset'] + end.size
preload_size += offset
self._data.write(struct.pack('<I', preload_size))
for entry, _ in self._contents.itervalues():
for entry, _ in six.itervalues(self._contents):
entry['offset'] += offset
self._data.write(entry.serialize())
self._data.write(end.serialize())
# Store local file entries followed by compressed data
for entry, content in self._contents.itervalues():
for entry, content in six.itervalues(self._contents):
self._data.write(headers[entry].serialize())
self._data.write(content)
# On non optimized archives, store the central directory entries.
if not preload_size:
end['cdir_offset'] = offset
for entry, _ in self._contents.itervalues():
for entry, _ in six.itervalues(self._contents):
self._data.write(entry.serialize())
# Store the end of central directory.
self._data.write(end.serialize())