From 8921c79fb98e5e04c0e2f00813e9d8e015e4206e Mon Sep 17 00:00:00 2001 From: Jimmy Cao Date: Sun, 12 Mar 2017 12:16:45 -0400 Subject: Prevent non-str values from being concatenated with + (#40) Make _make_line concatenate only strings directly. --- systemd/journal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemd/journal.py b/systemd/journal.py index 83e3004..524ca9f 100644 --- a/systemd/journal.py +++ b/systemd/journal.py @@ -394,10 +394,10 @@ def get_catalog(mid): def _make_line(field, value): if isinstance(value, bytes): return field.encode('utf-8') + b'=' + value - elif isinstance(value, int): - return field + '=' + str(value) - else: + elif isinstance(value, str): return field + '=' + value + else: + return field + '=' + str(value) def send(MESSAGE, MESSAGE_ID=None, CODE_FILE=None, CODE_LINE=None, CODE_FUNC=None, -- cgit v1.2.1