External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 22:49:32 -02:30
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

4
awx/main/tests/unit/utils/test_formatters.py
View File

@@ -1,3 +1,5 @@
import six
from awx.main.models import Job, JobEvent
from awx.main.utils.formatters import LogstashFormatter
@@ -13,7 +15,7 @@ def test_log_from_job_event_object():
# Check entire body of data for any exceptions from getattr on event object
for fd in data_for_log:
if not isinstance(data_for_log[fd], basestring):
if not isinstance(data_for_log[fd], six.string_types):
continue
assert 'Exception' not in data_for_log[fd], 'Exception delivered in data: {}'.format(data_for_log[fd])