zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-29 11:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

basestring to six.string_types for Python 3

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/utils/common.py
View File

@@ -611,7 +611,7 @@ def parse_yaml_or_json(vars_str, silent_failure=True):
'''
if isinstance(vars_str, dict):
return vars_str
elif isinstance(vars_str, basestring) and vars_str == '""':
elif isinstance(vars_str, six.string_types) and vars_str == '""':
return {}
try:

4
awx/main/utils/formatters.py
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 = {}