basestring to six.string_types for Python 3

This commit is contained in:
cclauss
2018-02-09 16:28:36 +01:00
parent ce9cb24995
commit c371b869dc
11 changed files with 43 additions and 30 deletions

View File

@@ -7,6 +7,8 @@ import json
import time
import logging
import six
class TimeFormatter(logging.Formatter):
'''
@@ -41,7 +43,7 @@ class LogstashFormatter(LogstashFormatterVersion1):
data = copy(raw_data['ansible_facts'])
else:
data = copy(raw_data)
if isinstance(data, basestring):
if isinstance(data, six.string_types):
data = json.loads(data)
data_for_log = {}