diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py index 7bcafc520895662729245e9a8a0cc428a82634b6..42b039b0d64695f854c4684e6b0c110610e81021 100644 --- a/Ccs/ccs_function_lib.py +++ b/Ccs/ccs_function_lib.py @@ -2839,6 +2839,9 @@ def get_tm_id(pcf_descr=None): def get_data_pool_items(pcf_descr=None, src_file=None): + if not isinstance(src_file, str): + raise TypeError('src_file must be str, is {}.'.format(type(src_file))) + if src_file: with open(src_file, 'r') as fd: lines = fd.readlines() @@ -2850,7 +2853,7 @@ def get_data_pool_items(pcf_descr=None, src_file=None): if len(dp_item) == 6: data_pool.append(dp_item[:2][::-1] + dp_item[2:]) else: - raise Exception + raise ValueError('Wrong format of input line in {}.'.format(src_file)) return data_pool diff --git a/Tst/tst/data_pool_tab.py b/Tst/tst/data_pool_tab.py index 30375d74df501a48f7b587003888b8d9f5a37b77..1cd6baf03772e181135685b8f349ed2270019180 100644 --- a/Tst/tst/data_pool_tab.py +++ b/Tst/tst/data_pool_tab.py @@ -27,7 +27,7 @@ def reload_dp_data(): try: dictionary_of_data_pool = cfl.get_data_pool_items(src_file=DP_ITEMS_SRC_FILE) - except FileNotFoundError: + except (FileNotFoundError, ValueError): logger.warning('Could not load data pool from file: {}. Using MIB instead.'.format(DP_ITEMS_SRC_FILE)) dictionary_of_data_pool = cfl.get_data_pool_items() @@ -58,7 +58,7 @@ def get_data_pool_sublist(): data_pool_sublist = [] try: dictionary_of_data_pool = cfl.get_data_pool_items(src_file=DP_ITEMS_SRC_FILE) -except FileNotFoundError: +except (FileNotFoundError, ValueError): logger.warning('Could not load data pool from file: {}. Using MIB instead.'.format(DP_ITEMS_SRC_FILE)) dictionary_of_data_pool = cfl.get_data_pool_items()