Skip to content

Commit 614a68c

Browse files
committed
Use "text_type" from six instead of "unicode"
This fixes a Python3 incompatibility since "unicode" doesn't exist anymore on Python3. Fixes #3.
1 parent 8ebe8e5 commit 614a68c

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

logstash_async/formatter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
except ImportError:
1616
import simplejson as json
1717

18+
from six import text_type
1819
import logstash_async
1920

2021
# The list contains all the attributes listed in
@@ -229,12 +230,13 @@ def _get_extra_fields(self, record):
229230
if hasattr(record, 'request') and hasattr(record.request, 'META'):
230231
request = record.request
231232

233+
request_user = self._get_attribute_with_default(request, 'user', '')
232234
extra_fields['django_version'] = self._django_version
233235
extra_fields['req_useragent'] = request.META.get('HTTP_USER_AGENT', '<none>')
234236
extra_fields['req_remote_address'] = request.META.get('REMOTE_ADDR', '<none>')
235237
extra_fields['req_host'] = request.get_host()
236238
extra_fields['req_uri'] = request.get_raw_uri()
237-
extra_fields['req_user'] = self._get_attribute_with_default(request, 'user', '')
239+
extra_fields['req_user'] = text_type(request_user)
238240
extra_fields['req_method'] = request.META.get('REQUEST_METHOD', '')
239241
extra_fields['req_referer'] = request.META.get('HTTP_REFERER', '')
240242

0 commit comments

Comments
 (0)