Skip to content

Commit

Permalink
FIX: Use the default loader of ruamel yaml
Browse files Browse the repository at this point in the history
Ruamel YAML defaults to the rt (round-trip) loader, which preservs
comments.
  • Loading branch information
Birger Schacht authored and Wagner committed Jun 17, 2021
1 parent cf58860 commit 277f72d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions intelmq/lib/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ def set_queues(self, queues: Optional[str], queues_type: str):
q = {"_default": queues}
elif type_ is str:
q = {"_default": queues.split()}
elif type_ is dict:
elif isinstance(queues, dict):
q = queues
for key, val in queues.items():
q[key] = val if type(val) is list else val.split()
q[key] = val if isinstance(val, list) else str(val).split()
else:
raise exceptions.InvalidArgument(
'queues', got=queues,
expected=["None", "list of strings", "dict (of strings or lists that should have the _default key)"])
self.destination_queues = q
self.destination_queues = dict(q)
else:
raise exceptions.InvalidArgument('queues_type', got=queues_type, expected=['source', 'destination'])

Expand Down
2 changes: 1 addition & 1 deletion intelmq/lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
from intelmq.lib.exceptions import DecodingError
from intelmq import RUNTIME_CONF_FILE

yaml = YAML(typ="safe", pure=True)
yaml = YAML(pure=True)

__all__ = ['base64_decode', 'base64_encode', 'decode', 'encode',
'load_configuration', 'load_parameters', 'log', 'parse_logline',
Expand Down

0 comments on commit 277f72d

Please sign in to comment.