From 27e249e665dff12a36dc96d176abcd58dfd72cd3 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Sun, 22 Mar 2020 19:09:48 +0100 Subject: [PATCH] Adds missing try/catch when casting data from config file in ConfigLoader --- common/config_loader.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/config_loader.py b/common/config_loader.py index 9a9d82f..9b81871 100644 --- a/common/config_loader.py +++ b/common/config_loader.py @@ -58,7 +58,11 @@ class ConfigLoader: k_upper = k.upper() if k_upper in self.conf_fields: if self.conf_fields[k_upper]["type"] == int: - self.conf_fields[k_upper]["value"] = int(v) + try: + self.conf_fields[k_upper]["value"] = int(v) + except ValueError: + err_msg = "{} is not an integer ({}).".format(k, v) + raise ValueError(err_msg) else: self.conf_fields[k_upper]["value"] = v @@ -92,7 +96,7 @@ class ConfigLoader: value = self.conf_fields[field]["value"] correct_type = self.conf_fields[field]["type"] - if (value is not None) and isinstance(value, correct_type): + if isinstance(value, correct_type): conf_dict[field] = value else: err_msg = "{} variable in config is of the wrong type".format(field)