Fix for iteritems() python 3 compatibility.

skipper/cli.py

@@ -3,6 +3,7 @@
 import os.path
 import tabulate
 import click
+import six
 from pkg_resources import get_distribution
 from skipper import git
 from skipper import runner
@@ -46,7 +47,7 @@ def build(ctx, images_to_build, container_context):
     utils.logger.debug("Executing build command")
 
     valid_images = ctx.obj.get('containers') or utils.get_images_from_dockerfiles()
-    valid_images = {image: os.path.abspath(dockerfile) for image, dockerfile in valid_images.iteritems()}
+    valid_images = {image: os.path.abspath(dockerfile) for image, dockerfile in six.iteritems(valid_images)}
     valid_images_to_build = {}
     if not images_to_build:
         valid_images_to_build = valid_images
@@ -58,7 +59,7 @@ def build(ctx, images_to_build, container_context):
             valid_images_to_build[image] = valid_images[image]
 
     tag = git.get_hash()
-    for image, dockerfile in valid_images_to_build.iteritems():
+    for image, dockerfile in six.iteritems(valid_images_to_build):
         utils.logger.info('Building image: %(image)s', dict(image=image))
 
         if not os.path.exists(dockerfile):
@@ -296,7 +297,7 @@ def _validate_project_image(image):
 
 def _expend_env(ctx, extra_env):
     environment = []
-    for key, value in ctx.obj['env'].iteritems():
+    for key, value in six.iteritems(ctx.obj['env']):
         utils.logger.debug("Adding %s=%s to environment", key, value)
         environment.append("{}={}".format(key, value))
     return environment + list(extra_env)

skipper/config.py

@@ -2,6 +2,7 @@
 from collections import defaultdict
 import os
 import yaml
+import six
 
 
 def load_defaults():
@@ -18,7 +19,7 @@ def load_defaults():
 
 
 def _normalize_config(config, normalized_config):
-    for key, value in config.iteritems():
+    for key, value in six.iteritems(config):
         if isinstance(value, dict):
             normalized_config[key] = {}
             _normalize_config(value, normalized_config[key])

tests/test_cli.py

@@ -3,6 +3,7 @@
 import httplib
 import unittest
 import click
+import six
 from click import testing
 from skipper import cli
 from skipper import config
@@ -130,7 +131,7 @@ def test_subcommand_without_global_params(self):
             'make': ['-f', 'Makefile', 'all'],
         }
 
-        for subcmd, subcmd_params in subcmd_params_map.iteritems():
+        for subcmd, subcmd_params in six.iteritems(subcmd_params_map):
             result = self._invoke_cli(
                 global_params=None,
                 subcmd=subcmd,
@@ -861,7 +862,7 @@ def test_run_with_defaults_and_env_from_config_file(self, skipper_runner_run_moc
             subcmd='run',
             subcmd_params=run_params
         )
-        env = ["%s=%s" % (key, value) for key, value in CONFIG_ENV_EVALUATION.iteritems()]
+        env = ["%s=%s" % (key, value) for key, value in six.iteritems(CONFIG_ENV_EVALUATION)]
         expected_fqdn_image = 'skipper-conf-build-container-image:skipper-conf-build-container-tag'
         skipper_runner_run_mock.assert_called_once_with(command, fqdn_image=expected_fqdn_image, environment=env,
                                                         interactive=False, name=None, net='host', volumes=None, workdir=None)
@@ -880,7 +881,7 @@ def test_run_with_env_overriding_config_file(self, skipper_runner_run_mock, *arg
             subcmd='run',
             subcmd_params=run_params
         )
-        env = ["%s=%s" % (key, value) for key, value in CONFIG_ENV_EVALUATION.iteritems()] + ENV
+        env = ["%s=%s" % (key, value) for key, value in six.iteritems(CONFIG_ENV_EVALUATION)] + ENV
         expected_fqdn_image = 'skipper-conf-build-container-image:skipper-conf-build-container-tag'
         skipper_runner_run_mock.assert_called_once_with(command, fqdn_image=expected_fqdn_image, environment=env,
                                                         interactive=False, name=None, net='host', volumes=None, workdir=None)