diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-11-10 15:42:57 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-11-15 09:27:07 +0100 |
commit | 4fdbdd34fb5fea55571a18b2438ececa953928ff (patch) | |
tree | 44f1d6ff38cedad25b058ba18844e1004b7385db /functest/utils | |
parent | e25e576af33547657c278e2dae49b033bf6a1fa1 (diff) |
Update linters and fix all new issues
It mostly add encoding in open calls and leverage f-strings.
Change-Id: Ifead18fc724a452c1067dcf91dc577032edc9c59
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/utils')
-rw-r--r-- | functest/utils/config.py | 11 | ||||
-rw-r--r-- | functest/utils/functest_utils.py | 17 |
2 files changed, 14 insertions, 14 deletions
diff --git a/functest/utils/config.py b/functest/utils/config.py index 3226b2d1f..40414b88b 100644 --- a/functest/utils/config.py +++ b/functest/utils/config.py @@ -14,11 +14,12 @@ class Config(): def __init__(self): try: with open(pkg_resources.resource_filename( - 'functest', 'ci/config_functest.yaml')) as yfile: + 'functest', 'ci/config_functest.yaml'), + encoding='utf-8') as yfile: self.functest_yaml = yaml.safe_load(yfile) except Exception as error: raise Exception( - 'Parse config failed: {}'.format(str(error))) from error + f'Parse config failed: {str(error)}') from error @staticmethod def _merge_dicts(dict1, dict2): @@ -34,7 +35,7 @@ class Config(): yield (k, dict2[k]) def patch_file(self, patch_file_path): - with open(patch_file_path) as yfile: + with open(patch_file_path, encoding='utf-8') as yfile: patch_file = yaml.safe_load(yfile) for key in patch_file: @@ -53,14 +54,14 @@ class Config(): @staticmethod def _get_attr_further(attr_now, next): # pylint: disable=redefined-builtin return attr_now if next == 'general' else ( - '{}_{}'.format(attr_now, next) if attr_now else next) + f'{attr_now}_{next}' if attr_now else next) def fill(self): try: self._parse(None, self.functest_yaml) except Exception as error: raise Exception( - 'Parse config failed: {}'.format(str(error))) from error + f'Parse config failed: {str(error)}') from error CONF = Config() diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 31e453504..4078fb121 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -32,8 +32,8 @@ def execute_command_raise(cmd, info=False, error_msg="", def execute_command(cmd, info=False, error_msg="", verbose=True, output_file=None): if not error_msg: - error_msg = ("The command '%s' failed." % cmd) - msg_exec = ("Executing command: '%s'" % cmd) + error_msg = f"The command '{cmd}' failed." + msg_exec = f"Executing command: '{cmd}'" if verbose: if info: LOGGER.info(msg_exec) @@ -43,7 +43,7 @@ def execute_command(cmd, info=False, error_msg="", cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as popen: if output_file: - with open(output_file, "w") as ofd: + with open(output_file, "w", encoding='utf-8') as ofd: for line in iter(popen.stdout.readline, b''): if output_file: ofd.write(line.decode("utf-8")) @@ -65,14 +65,14 @@ def get_parameter_from_yaml(parameter, yfile): parameter must be given in string format with dots Example: general.openstack.image_name """ - with open(yfile) as yfd: + with open(yfile, encoding='utf-8') as yfd: file_yaml = yaml.safe_load(yfd) value = file_yaml for element in parameter.split("."): value = value.get(element) if value is None: - raise ValueError("The parameter %s is not defined in" - " %s" % (parameter, yfile)) + raise ValueError(f"The parameter {parameter} is not defined in" + f" {yfile}") return value @@ -195,14 +195,13 @@ def search_services(cloud, name_or_id=None, filters=None): def convert_dict_to_ini(value): "Convert dict to oslo.conf input" assert isinstance(value, dict) - return ",".join("{}:{}".format( - key, val) for (key, val) in six.iteritems(value)) + return ",".join(f"{key}:{val}" for (key, val) in six.iteritems(value)) def convert_list_to_ini(value): "Convert list to oslo.conf input" assert isinstance(value, list) - return ",".join("{}".format(val) for val in value) + return ",".join(val for val in value) def convert_ini_to_dict(value): |