Skip to content

Commit 314bad0

Browse files
committed
generic csv: handle empty string required_columns
fixes #2679
1 parent 5b76b36 commit 314bad0

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
2525
#### Collectors
2626

2727
#### Parsers
28+
- `intelmq.bots.parsers.generic_csv.parser_csv`: Handle empty string parameter `columns_required` as unset (PR#2680 by Sebastian Wagner, fixes #2679).
2829

2930
#### Experts
3031

intelmq/bots/parsers/generic/parser_csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def init(self):
6868
expected=("blacklist", "whitelist"),
6969
docs=DOCS)
7070

71-
if self.columns_required is None:
71+
if self.columns_required in [None, '']:
7272
self.columns_required = [True for _ in self.columns]
7373
if len(self.columns) != len(self.columns_required):
7474
raise ValueError("Length of parameters 'columns' (%d) and 'columns_required' (%d) "

intelmq/tests/bots/parsers/generic/test_parser_csv.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ def test_compose_fields(self):
105105
'delimiter': ','})
106106
self.assertMessageEqual(0, COMPOSE_EVENT)
107107

108+
def test_empty_required_colums(self):
109+
""" #2679 """
110+
self.run_bot(parameters={'columns_required': ''})
111+
self.assertMessageEqual(0, EXAMPLE_EVENT)
112+
self.run_bot(parameters={'columns_required': None})
113+
108114

109115
if __name__ == '__main__': # pragma: no cover
110116
unittest.main()

0 commit comments

Comments
 (0)