More compatibility with python 3

Author: costimuraru

hierarchical_yaml/config_generator.py

@@ -16,7 +16,7 @@
 import json
 from .interpolation import InterpolationResolver, InterpolationValidator
 from .remote_state import S3TerraformRemoteStateRetriever
-from .python_compat import iteritems
+from .python_compat import iteritems, primitive_types
 
 class ConfigProcessor(object):
 
@@ -139,7 +139,7 @@ def merge_yamls(values, yaml_content):
             if key in values and type(values[key]) != type(value):
                 raise Exception("Failed to merge key '{}', because of mismatch in type: {} vs {}"
                                 .format(key, type(values[key]), type(value)))
-            if key in values and not isinstance(value, (basestring, int, bool)):
+            if key in values and not isinstance(value, primitive_types):
                 values[key] = ConfigGenerator.merge_value(values[key], value)
             else:
                 values[key] = value

hierarchical_yaml/interpolation.py

@@ -10,14 +10,17 @@
 
 import re
 from .inject_secrets import SecretInjector
+from .python_compat import iteritems, string_types, primitive_types
 
 
 def is_interpolation(value):
-    return isinstance(value, (basestring)) and '{{' in value and '}}' in value
+    return isinstance(value, string_types) and '{{' in value and '}}' in value
+
 
 def is_full_interpolation(value):
     return is_interpolation(value) and value.startswith('{{') and value.endswith('}}')
 
+
 def remove_white_spaces(value):
     return re.sub(r"\s+", "", value)
 
@@ -59,7 +62,7 @@ def __init__(self):
         pass
 
     def loop_all_items(self, data, process_func):
-        if isinstance(data, basestring):
+        if isinstance(data, string_types):
             return process_func(data)
         if isinstance(data, list):
             items = []
@@ -134,13 +137,13 @@ def __init__(self):
 
     def resolve(self, line, data):
         """
-        :param input: {{env.name}} 
+        :param line: {{env.name}}
         :param data: (env: name: dev)
         :return: dev
         """
 
         self.parse_leaves(data, "")
-        for key, value in self.results.iteritems():
+        for key, value in iteritems(self.results):
             placeholder = "{{" + key + "}}"
             if placeholder not in line:
                 continue
@@ -151,7 +154,7 @@ def resolve(self, line, data):
         return line
 
     def parse_leaves(self, data, partial_key):
-        if isinstance(data, (basestring, int, bool)):
+        if isinstance(data, primitive_types):
             self.results[partial_key] = data
             return
         if isinstance(data, dict):

hierarchical_yaml/python_compat.py

@@ -16,7 +16,9 @@
     iteritems = lambda d: iter(d.items())
     integer_types = (int,)
     string_types = (str,)
+    primitive_types = (str, int, bool)
 else:
     iteritems = lambda d: d.iteritems()
     integer_types = (int, long)
     string_types = (str, unicode)
+    primitive_types = (str, unicode, int, long, bool)