summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Cao <jc2462@cornell.edu>2017-03-12 12:16:45 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-03-12 12:16:45 -0400
commit8921c79fb98e5e04c0e2f00813e9d8e015e4206e (patch)
treed30f455067a9e9fe2be98714120a5bc696dde71e
parent753a4ca5ffbea9e7b937dbe5c567353f9ca21f85 (diff)
downloadpython-systemd-8921c79fb98e5e04c0e2f00813e9d8e015e4206e.tar.gz
Prevent non-str values from being concatenated with + (#40)
Make _make_line concatenate only strings directly.
-rw-r--r--systemd/journal.py6
1 files 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,