From 57137834188b60b72e64f3d901ea8532bfa9f0c4 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 16 Sep 2024 17:58:18 +0200 Subject: [PATCH 1/2] doc: fix sytax in shadowserver parser section --- docs/user/bots.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/bots.md b/docs/user/bots.md index 2c8ec6e9d..433fe98ef 100644 --- a/docs/user/bots.md +++ b/docs/user/bots.md @@ -2202,7 +2202,7 @@ For example using `curl -s https://interchange.shadowserver.org/intelmq/v1/schem (optional, boolean) If an existing `feed.name` should be overwritten. -** `auto_update`** +**`auto_update`** (optional, boolean) Enable automatic schema download. From a6ba4ed5cda62b620625eeb4705eac0a9ef6ec50 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 16 Sep 2024 17:58:54 +0200 Subject: [PATCH 2/2] shadowserver parser: fix error message formatting if schema file is absent --- CHANGELOG.md | 2 ++ intelmq/bots/parsers/shadowserver/_config.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 954a51188..ad1ab29b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ #### Collectors #### Parsers +- `intelmq.bots.parsers.shadowserver._config`: + - fix error message formatting if schema file is absent (PR#2528 by Sebastian Wagner). #### Experts diff --git a/intelmq/bots/parsers/shadowserver/_config.py b/intelmq/bots/parsers/shadowserver/_config.py index fa3ed3022..57391bc77 100644 --- a/intelmq/bots/parsers/shadowserver/_config.py +++ b/intelmq/bots/parsers/shadowserver/_config.py @@ -341,7 +341,7 @@ def reload(): return else: if not __config.test_mode: - raise ValueError("The schema file does not exist: %r.", __config.schema_file) + raise ValueError(f"The schema file does not exist: {__config.schema_file}.") __config.feedname_mapping.clear() __config.filename_mapping.clear()