From 3d766c286184ce1e0b93e84abb2ca2d3fbb33aba Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Fri, 22 Jan 2021 15:22:25 +0100 Subject: [PATCH] Reduced complexity of a property method Validation.get_formated_data was needlesly complex Now it relies more on dictionaries it already used. Couldn't find any other uses of Validation._col_keys, might be candidate for further changes, or reversion. Signed-off-by: Jiri Podivin Change-Id: Ied557010b31b83fbb823476c6ea4900ee7d9c581 --- validations_libs/validation.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/validations_libs/validation.py b/validations_libs/validation.py index 7042a227..a4501e2c 100644 --- a/validations_libs/validation.py +++ b/validations_libs/validation.py @@ -69,7 +69,12 @@ class Validation(object): """ - _col_keys = ['ID', 'Name', 'Description', 'Groups'] + _col_names = { + 'id': 'ID', + 'name': 'Name', + 'description': 'Description', + 'groups': 'Groups' + } def __init__(self, validation_path): self.dict = self._get_content(validation_path) @@ -273,15 +278,13 @@ class Validation(object): """ data = {} metadata = self.get_metadata + if metadata: for key in metadata.keys(): - if key in map(str.lower, self._col_keys): - for k in self._col_keys: - if key == k.lower(): - output_key = k - data[output_key] = self.get_metadata.get(key) + if key in self._col_names.keys(): + data[self._col_names[key]] = metadata[key] else: # Get all other values: - data[key] = self.get_metadata.get(key) + data[key] = metadata[key] return data