Move the proj to python3

The aim of this patch is to upgrade python version
of this project from python2 to python3.

Signed-off-by: Panagiotis Karalis <panos.pkaralis@gmail.com>
Change-Id: I3d3ef01176fda1b23a0542a24625be2f3368c40e

3 files changed, 10 insertions, 10 deletions

diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py
index 1d13c696..98be8e62 100644
--- a/dovetail/utils/dovetail_config.py
+++ b/dovetail/utils/dovetail_config.py
@@ -25,7 +25,7 @@ class DovetailConfig(object):
         path = os.path.join(conf_path, cls.dovetail_config['cli_file_name'])
         with open(path) as f:
             cmd_yml = yaml.safe_load(f)
-            cls.dovetail_config['cli'] = cmd_yml[cmd_yml.keys()[0]]
+            cls.dovetail_config['cli'] = cmd_yml[list(cmd_yml.keys())[0]]
 
     # update dovetail_config dict with the giving path.
     # if path is in the dovetail_config dict, its value will be replaced.
diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py
index e22ef4d6..7c00a252 100644
--- a/dovetail/utils/dovetail_logger.py
+++ b/dovetail/utils/dovetail_logger.py
@@ -26,7 +26,7 @@ import logging
 import os
 import sys
 
-from dovetail_config import DovetailConfig as dt_cfg
+from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg
 
 
 class Logger(object):
diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py
index aee6dc29..9259b03f 100644
--- a/dovetail/utils/dovetail_utils.py
+++ b/dovetail/utils/dovetail_utils.py
@@ -23,8 +23,8 @@ import python_hosts
 import docker
 
 from dovetail import constants
-from dovetail_config import DovetailConfig as dt_cfg
-from openstack_utils import OS_Utils
+from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg
+from dovetail.utils.openstack_utils import OS_Utils
 
 
 def exec_log(verbose, logger, msg, level, flush=False):
@@ -80,12 +80,12 @@ def exec_cmd(cmd, logger=None, exit_on_error=False, info=False,
 # walkthrough the object, yield path and value
 
 # dual python 2/3 compatibility, inspired by the "six" library
-string_types = (str, unicode) if str is bytes else (str, bytes)
-# iteritems = lambda mapping: getattr(mapping, 'iteritems', mapping.items)()
+string_types = (str, 'unicode') if str is bytes else (str, bytes)
+# items = lambda mapping: getattr(mapping, 'items', mapping.items)()
 
 
-def iteritems(mapping):
-    return getattr(mapping, 'iteritems', mapping.items)()
+def items(mapping):
+    return getattr(mapping, 'items', mapping.items)()
 
 
 def objwalk(obj, path=(), memo=None):
@@ -93,7 +93,7 @@ def objwalk(obj, path=(), memo=None):
         memo = set()
     iterator = None
     if isinstance(obj, Mapping):
-        iterator = iteritems
+        iterator = items
     elif isinstance(obj, (Sequence, Set)) and not isinstance(obj,
                                                              string_types):
         iterator = enumerate
@@ -332,7 +332,7 @@ def get_hosts_info(logger=None):
             logger.error('There is no key hosts_info in file {}'
                          .format(hosts_config_file))
             return hosts_config
-        for ip, hostnames in hosts_info.iteritems():
+        for ip, hostnames in hosts_info.items():
             if not hostnames:
                 continue
             add_hosts_info(ip, hostnames)