python-modernize -f libmodernize.fixes.fix_dict_six
This commit is contained in:
Tomas Kopecek
Mike McLean
parent
b96092334d
commit
bcee24e50c
20 changed files with 130 additions and 112 deletions
|
|
@ -21,6 +21,8 @@
|
|||
# Mike McLean <mikem@redhat.com>
|
||||
# Mike Bonnet <mikeb@redhat.com>
|
||||
|
||||
from __future__ import absolute_import
|
||||
import six
|
||||
try:
|
||||
import krbV
|
||||
except ImportError: # pragma: no cover
|
||||
|
|
@ -1054,7 +1056,7 @@ class BuildTask(BaseTaskHandler):
|
|||
archdict[a] = 1
|
||||
if not archdict:
|
||||
raise koji.BuildError("No matching arches were found")
|
||||
return archdict.keys()
|
||||
return list(archdict.keys())
|
||||
|
||||
|
||||
def choose_taskarch(self, arch, srpm, build_tag):
|
||||
|
|
@ -1115,7 +1117,7 @@ class BuildTask(BaseTaskHandler):
|
|||
self.logger.debug("Waiting on subtasks...")
|
||||
|
||||
# wait for subtasks to finish
|
||||
results = self.wait(subtasks.values(), all=True, failany=failany)
|
||||
results = self.wait(list(subtasks.values()), all=True, failany=failany)
|
||||
|
||||
# finalize import
|
||||
# merge data into needed args for completeBuild call
|
||||
|
|
@ -1123,7 +1125,7 @@ class BuildTask(BaseTaskHandler):
|
|||
brmap = {}
|
||||
logs = {}
|
||||
built_srpm = None
|
||||
for (arch, task_id) in subtasks.iteritems():
|
||||
for (arch, task_id) in six.iteritems(subtasks):
|
||||
result = results[task_id]
|
||||
self.logger.debug("DEBUG: %r : %r " % (arch,result,))
|
||||
brootid = result['brootid']
|
||||
|
|
@ -1631,7 +1633,7 @@ class BuildMavenTask(BaseBuildTask):
|
|||
for filepath in logs:
|
||||
self.uploadFile(os.path.join(outputdir, filepath),
|
||||
relPath=os.path.dirname(filepath))
|
||||
for relpath, files in output_files.iteritems():
|
||||
for relpath, files in six.iteritems(output_files):
|
||||
for filename in files:
|
||||
self.uploadFile(os.path.join(outputdir, relpath, filename),
|
||||
relPath=relpath)
|
||||
|
|
@ -2097,7 +2099,7 @@ class ChainMavenTask(MultiPlatformTask):
|
|||
running[task_id] = package
|
||||
del todo[package]
|
||||
try:
|
||||
results = self.wait(running.keys())
|
||||
results = self.wait(list(running.keys()))
|
||||
except (xmlrpclib.Fault, koji.GenericError) as e:
|
||||
# One task has failed, wait for the rest to complete before the
|
||||
# chainmaven task fails. self.wait(all=True) should thrown an exception.
|
||||
|
|
@ -2150,8 +2152,8 @@ class ChainMavenTask(MultiPlatformTask):
|
|||
have the same keys and those keys have the same values. If a value is
|
||||
list, it will be considered equal to a list with the same values in
|
||||
a different order."""
|
||||
akeys = a.keys()
|
||||
bkeys = b.keys()
|
||||
akeys = list(a.keys())
|
||||
bkeys = list(b.keys())
|
||||
if sorted(akeys) != sorted(bkeys):
|
||||
return False
|
||||
for key in akeys:
|
||||
|
|
@ -2312,7 +2314,7 @@ class BuildBaseImageTask(BuildImageTask):
|
|||
canfail.append(subtasks[arch])
|
||||
self.logger.debug("Got image subtasks: %r" % (subtasks))
|
||||
self.logger.debug("Waiting on image subtasks (%s can fail)..." % canfail)
|
||||
results = self.wait(subtasks.values(), all=True, failany=True, canfail=canfail)
|
||||
results = self.wait(list(subtasks.values()), all=True, failany=True, canfail=canfail)
|
||||
|
||||
# if everything failed, fail even if all subtasks are in canfail
|
||||
self.logger.debug('subtask results: %r', results)
|
||||
|
|
@ -2621,7 +2623,7 @@ class BuildLiveMediaTask(BuildImageTask):
|
|||
|
||||
self.logger.debug("Got image subtasks: %r", subtasks)
|
||||
self.logger.debug("Waiting on livemedia subtasks...")
|
||||
results = self.wait(subtasks.values(), all=True, failany=True, canfail=canfail)
|
||||
results = self.wait(list(subtasks.values()), all=True, failany=True, canfail=canfail)
|
||||
|
||||
# if everything failed, fail even if all subtasks are in canfail
|
||||
self.logger.debug('subtask results: %r', results)
|
||||
|
|
@ -2657,7 +2659,7 @@ class BuildLiveMediaTask(BuildImageTask):
|
|||
wrapper_tasks[arch] = self.subtask('wrapperRPM', arglist,
|
||||
label='wrapper %s' % arch, arch='noarch')
|
||||
|
||||
results2 = self.wait(wrapper_tasks.values(), all=True, failany=True)
|
||||
results2 = self.wait(list(wrapper_tasks.values()), all=True, failany=True)
|
||||
self.logger.debug('wrapper results: %r', results2)
|
||||
|
||||
# add wrapper rpm results into main results
|
||||
|
|
@ -2919,7 +2921,7 @@ class ImageTask(BaseTaskHandler):
|
|||
}
|
||||
|
||||
# Duplicated with pungi/util.py _apply_substitutions
|
||||
for k, v in sorted(substitutions.items(), key=lambda x: len(x[0]), reverse=True):
|
||||
for k, v in sorted(list(substitutions.items()), key=lambda x: len(x[0]), reverse=True):
|
||||
if k in name:
|
||||
name = name.replace(k, v)
|
||||
if k in version:
|
||||
|
|
@ -3716,7 +3718,7 @@ class BaseImageTask(OzImageTask):
|
|||
if len(formats) == 0:
|
||||
# we only want a raw disk image (no format option given)
|
||||
f_dict['raw'] = True
|
||||
elif 'raw' not in f_dict.keys():
|
||||
elif 'raw' not in list(f_dict.keys()):
|
||||
f_dict['raw'] = False
|
||||
self.logger.debug('Image delivery plan: %s' % f_dict)
|
||||
return f_dict
|
||||
|
|
@ -4955,7 +4957,7 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
|
|||
def uniq(self, items):
|
||||
"""Remove duplicates from the list of items, and sort the list."""
|
||||
m = dict(zip(items, [1] * len(items)))
|
||||
l = m.keys()
|
||||
l = list(m.keys())
|
||||
l.sort()
|
||||
return l
|
||||
|
||||
|
|
@ -5000,8 +5002,8 @@ class NewRepoTask(BaseTaskHandler):
|
|||
# gather subtask results
|
||||
data = {}
|
||||
if subtasks:
|
||||
results = self.wait(subtasks.values(), all=True, failany=True)
|
||||
for (arch, task_id) in subtasks.iteritems():
|
||||
results = self.wait(list(subtasks.values()), all=True, failany=True)
|
||||
for (arch, task_id) in six.iteritems(subtasks):
|
||||
data[arch] = results[task_id]
|
||||
self.logger.debug("DEBUG: %r : %r " % (arch,data[arch],))
|
||||
|
||||
|
|
@ -5154,7 +5156,7 @@ class NewDistRepoTask(BaseTaskHandler):
|
|||
method='createdistrepo', arglist=arglist, label=arch,
|
||||
parent=self.id, arch='noarch')
|
||||
if len(subtasks) > 0 and task_opts['multilib']:
|
||||
self.wait(subtasks.values(), all=True, failany=True)
|
||||
self.wait(list(subtasks.values()), all=True, failany=True)
|
||||
for arch in arch32s:
|
||||
# move the 32-bit task output to the final resting place
|
||||
# so the 64-bit arches can use it for multilib
|
||||
|
|
@ -5168,8 +5170,8 @@ class NewDistRepoTask(BaseTaskHandler):
|
|||
method='createdistrepo', arglist=arglist, label=arch,
|
||||
parent=self.id, arch='noarch')
|
||||
# wait for 64-bit subtasks to finish
|
||||
self.wait(subtasks.values(), all=True, failany=True)
|
||||
for (arch, task_id) in subtasks.iteritems():
|
||||
self.wait(list(subtasks.values()), all=True, failany=True)
|
||||
for (arch, task_id) in six.iteritems(subtasks):
|
||||
if task_opts['multilib'] and arch in arch32s:
|
||||
# already moved above
|
||||
continue
|
||||
|
|
@ -5505,7 +5507,7 @@ enabled=1
|
|||
# select our rpms
|
||||
selected = {}
|
||||
for rpm_id in rpm_idx:
|
||||
avail_keys = rpm_idx[rpm_id].keys()
|
||||
avail_keys = list(rpm_idx[rpm_id].keys())
|
||||
best_key = self.pick_key(keys, avail_keys)
|
||||
if best_key is None:
|
||||
# we lack a matching key for this rpm
|
||||
|
|
@ -5569,7 +5571,7 @@ enabled=1
|
|||
fmt = '%(name)s-%(version)s-%(release)s.%(arch)s'
|
||||
filenames = [[fmt % selected[r], r] for r in sig_missing]
|
||||
for fname, rpm_id in sorted(filenames):
|
||||
avail = rpm_idx.get(rpm_id, {}).keys()
|
||||
avail = list(rpm_idx.get(rpm_id, {}).keys())
|
||||
outfile.write('%s: %r\n' % (fname, avail))
|
||||
outfile.close()
|
||||
self.session.uploadWrapper(missing_log, self.uploadpath)
|
||||
|
|
@ -5823,7 +5825,7 @@ def get_options():
|
|||
defaults[name] = config.getboolean('kojid', name)
|
||||
elif name in ['plugin', 'plugins']:
|
||||
defaults['plugin'] = value.split()
|
||||
elif name in defaults.keys():
|
||||
elif name in list(defaults.keys()):
|
||||
defaults[name] = value
|
||||
elif name.upper().startswith('RLIMIT_'):
|
||||
defaults[name.upper()] = value
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue