python-modernize -f libmodernize.fixes.fix_dict_six

vm/kojikamid.py

@@ -26,6 +26,7 @@
 #   kojiwind --install
 # in a cygwin shell.
 
+from __future__ import absolute_import
 from optparse import OptionParser
 from ConfigParser import ConfigParser
 import os
@@ -42,6 +43,7 @@ import threading
 import re
 import glob
 import zipfile
+import six
 
 MANAGER_PORT = 7000
 
@@ -639,7 +641,7 @@ def stream_logs(server, handler, builds):
                 logpath = os.path.join(build.source_dir, relpath)
                 if logpath not in logs:
                     logs[logpath] = (relpath, None)
-        for log, (relpath, fd) in logs.iteritems():
+        for log, (relpath, fd) in six.iteritems(logs):
             if not fd:
                 if os.path.isfile(log):
                     try:

vm/kojivmd

@@ -150,7 +150,7 @@ def get_options():
                 defaults[name] = config.getboolean('kojivmd', name)
             elif name in ['plugin', 'plugins']:
                 defaults['plugin'] = value.split()
-            elif name in defaults.keys():
+            elif name in list(defaults.keys()):
                 defaults[name] = value
             else:
                 quit("unknown config option: %s" % name)
@@ -314,7 +314,7 @@ class WinBuildTask(MultiPlatformTask):
                                    strict=False)
         # winspec and patches options are urls
         # verify the urls before passing them to the VM
-        for url in [source_url] + subopts.values():
+        for url in [source_url] + list(subopts.values()):
             scm = SCM(url)
             scm.assert_allowed(self.options.allowed_scms)