From f8f66599df5ea4799b6435f95598f9a049c74727 Mon Sep 17 00:00:00 2001 From: snapshotleisure Date: Sat, 11 Nov 2023 21:48:43 +1100 Subject: [PATCH 1/2] Added NoneType error check for convert_to_list --- SPECS/ansible/tdnf.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SPECS/ansible/tdnf.py b/SPECS/ansible/tdnf.py index 90d11b1134..fc4230b048 100644 --- a/SPECS/ansible/tdnf.py +++ b/SPECS/ansible/tdnf.py @@ -289,12 +289,14 @@ def convert_to_list(input_list): """Convert nested list into flat list""" flat_list = [] - for sublist in input_list: - if not isinstance(sublist, list): - flat_list.append(sublist) - continue - for item in sublist: - flat_list.append(item) + if input_list is not None: + for sublist in input_list: + if not isinstance(sublist, list): + flat_list.append(sublist) + continue + if sublist is not None: + for item in sublist: + flat_list.append(item) return flat_list From c10e48db1963a2dcd428a0d0596fcd1ad8a8978b Mon Sep 17 00:00:00 2001 From: snapshotleisure Date: Mon, 13 Nov 2023 21:43:31 +1100 Subject: [PATCH 2/2] Fixing convert_to_list function to handle input None --- SPECS/ansible/tdnf.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/SPECS/ansible/tdnf.py b/SPECS/ansible/tdnf.py index fc4230b048..84b7c006ed 100644 --- a/SPECS/ansible/tdnf.py +++ b/SPECS/ansible/tdnf.py @@ -289,14 +289,15 @@ def convert_to_list(input_list): """Convert nested list into flat list""" flat_list = [] - if input_list is not None: - for sublist in input_list: - if not isinstance(sublist, list): - flat_list.append(sublist) - continue - if sublist is not None: - for item in sublist: - flat_list.append(item) + if not input_list: + return flat_list + + for sublist in input_list: + if not isinstance(sublist, list): + flat_list.append(sublist) + continue + for item in sublist: + flat_list.append(item) return flat_list