From 8a1bcebbd923da2536c568b489faf4d1cdc51f37 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Sat, 13 Mar 2021 17:41:25 +0100 Subject: [PATCH 1/3] fix issue if additionalWildcard is not set (eg. descriptor) --- boswatch/wildcard.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boswatch/wildcard.py b/boswatch/wildcard.py index 3519502..3c7debd 100644 --- a/boswatch/wildcard.py +++ b/boswatch/wildcard.py @@ -97,8 +97,9 @@ def replaceWildcards(message, bwPacket): if field is not None: message = message.replace(wildcard, field) - for wildcard, field in _additionalWildcards.items(): + for wildcard, fieldName in _additionalWildcards.items(): + field = bwPacket.get(fieldName) if field is not None: - message = message.replace(wildcard, bwPacket.get(field)) + message = message.replace(wildcard, field) return message From 01e94856ac17c481f1a7f2884783f493097e972b Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 17 Feb 2022 10:05:07 +0100 Subject: [PATCH 2/3] Update run_pytest.yml drop py3.6, add py3.10 to action --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index 69d1a7d..c4c5751 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10] runs-on: ${{matrix.os}} steps: From 7ecec6940fde2329aed357cdd6a0bce189ca4748 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 17 Feb 2022 10:07:51 +0100 Subject: [PATCH 3/3] Update run_pytest.yml fix gh-action --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index c4c5751..9ed7032 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.7, 3.8, 3.9, 3.10] + python-version: [3.7, 3.8, 3.9, 3.10.2] runs-on: ${{matrix.os}} steps: