Merge branch 'develop' into develop

This commit is contained in:
Bastian Schroll 2022-02-17 10:12:10 +01:00 committed by GitHub
commit ee6095cf15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View file

@ -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.2]
runs-on: ${{matrix.os}}
steps:

View file

@ -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