entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

misc: adapt journal logging string handling for python 3 (#36221)

This commit is contained in:
Frédéric Péters 2019-09-18 12:17:22 +02:00
parent aba088843d
commit ca5d0b18c3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hobo/journal.py
View File

@ -25,6 +25,7 @@ from syslog import (LOG_ALERT, LOG_CRIT, LOG_ERR,
LOG_WARNING, LOG_INFO, LOG_DEBUG)
from systemd._journal import sendv
from django.utils import six
_IDENT_CHARACTER = set('ABCDEFGHIJKLMNOPQRTSUVWXYZ_0123456789')
@ -36,7 +37,7 @@ def _valid_field_name(s):
def _make_line(field, value):
if isinstance(value, bytes):
return field.encode('utf-8') + b'=' + value
elif isinstance(value, basestring):
elif isinstance(value, six.string_types):
return field + '=' + value
else:
return field + '=' + str(value)