Cosmetic fixes

Author: costimuraru

hierarchical_yaml/config_generator.py

@@ -16,7 +16,8 @@
 import json
 from .interpolation import InterpolationResolver, InterpolationValidator
 from .remote_state import S3TerraformRemoteStateRetriever
-from .python_compat import iteritems, primitive_types
+from .python_compat import iteritems, primitive_types, PY3
+
 
 class ConfigProcessor(object):
 
@@ -103,11 +104,10 @@ def dict_constructor(loader, node):
         Dumper.add_representer(OrderedDict, dict_representer)
         Loader.add_constructor(_mapping_tag, dict_constructor)
 
-        Dumper.add_representer(str,
-                               SafeRepresenter.represent_str)
+        Dumper.add_representer(str, SafeRepresenter.represent_str)
 
-        Dumper.add_representer(unicode,
-                               SafeRepresenter.represent_unicode)
+        if not PY3:
+            Dumper.add_representer(unicode, SafeRepresenter.represent_unicode)
         return Dumper
 
     @staticmethod

hierarchical_yaml/inject_secrets.py

@@ -14,6 +14,7 @@
 except ImportError:
     from backports.functools_lru_cache import lru_cache
 
+
 class SecretInjector(object):
     """
     Resolve secrets in the form:

hierarchical_yaml/interpolation.py

@@ -24,6 +24,7 @@ def is_full_interpolation(value):
 def remove_white_spaces(value):
     return re.sub(r"\s+", "", value)
 
+
 class InterpolationResolver(object):
 
     def resolve_interpolations(self, data):
@@ -56,10 +57,7 @@ def get_secret_injector(self, data):
         return SecretInjector(default_aws_profile)
 
 
-class DictIterator:
-
-    def __init__(self):
-        pass
+class DictIterator(object):
 
     def loop_all_items(self, data, process_func):
         if isinstance(data, string_types):
@@ -78,8 +76,6 @@ def loop_all_items(self, data, process_func):
 
 
 class AbstractInterpolationResolver(DictIterator):
-    def __init__(self):
-        pass
 
     def resolve_interpolations(self, data):
         return self.loop_all_items(data, self.resolve_interpolation)
@@ -118,9 +114,6 @@ def do_resolve_interpolation(self, line):
 
 class InterpolationValidator(DictIterator):
 
-    def __init__(self):
-        pass
-
     def check_all_interpolations_resolved(self, data):
         return self.loop_all_items(data, self.validate_value)
 
@@ -130,7 +123,7 @@ def validate_value(self, value):
         return value
 
 
-class FromDictInjector:
+class FromDictInjector(object):
 
     def __init__(self):
         self.results = {}
@@ -167,10 +160,7 @@ def parse_leaves(self, data, partial_key):
                 self.parse_leaves(value, new_key)
 
 
-class FullBlobInjector:
-
-    def __init__(self):
-        pass
+class FullBlobInjector(object):
 
     def resolve(self, line, data):
         if not is_full_interpolation(line):

hierarchical_yaml/main.py

@@ -12,6 +12,7 @@
 import os
 from .config_generator import ConfigProcessor
 
+
 def run(args=None):
     """ App entry point """
 
@@ -32,7 +33,7 @@ def run(args=None):
     parser.add_argument('--enclosing-key', dest='enclosing_key', type=str,
                         help='enclose the generated data under a common key')
     parser.add_argument('--cwd', dest='cwd', type=str, default="",
-                            help='the working directory')
+                        help='the working directory')
 
     opts = parser.parse_args(args)
     cwd = opts.cwd if opts.cwd else os.getcwd()
@@ -42,5 +43,5 @@ def run(args=None):
 
     config_processor = ConfigProcessor()
     config_processor.process(cwd, opts.path, filters, excluded_keys, opts.enclosing_key, opts.output_format,
-                          print_data, opts.output_file, opts.skip_interpolation_resolving, 
-                          opts.skip_interpolation_validation)
+                             print_data, opts.output_file, opts.skip_interpolation_resolving,
+                             opts.skip_interpolation_validation)

hierarchical_yaml/simplessm.py

@@ -1,12 +1,12 @@
-#Copyright 2019 Adobe. All rights reserved.
-#This file is licensed to you under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. You may obtain a copy
-#of the License at http://www.apache.org/licenses/LICENSE-2.0
+# Copyright 2019 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License. You may obtain a copy
+# of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-#Unless required by applicable law or agreed to in writing, software distributed under
-#the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
-#OF ANY KIND, either express or implied. See the License for the specific language
-#governing permissions and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software distributed under
+# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+# OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
 
 from botocore.exceptions import ClientError
 import boto3
@@ -24,10 +24,11 @@ def get(self, key):
         try:
             return client.get_parameter(Name=key, WithDecryption=True).get("Parameter").get("Value")
         except ClientError as e:
-            raise Exception('Error while trying to read SSM value for key: %s - %s' % (key, e.response['Error']['Code']))
+            raise Exception(
+                'Error while trying to read SSM value for key: %s - %s' % (key, e.response['Error']['Code']))
         finally:
             self.release_ssm_client()
-    
+
     def get_ssm_client(self):
         os.environ['AWS_PROFILE'] = self.aws_profile
         return boto3.client('ssm', region_name=self.region_name)