fix some isolated py3 bugs

awx/lib/awx_display_callback/events.py

@@ -54,9 +54,8 @@ class IsolatedFileWrite:
         filename = '{}-partial.json'.format(event_uuid)
         dropoff_location = os.path.join(self.private_data_dir, 'artifacts', 'job_events', filename)
         write_location = '.'.join([dropoff_location, 'tmp'])
-        partial_data = json.dumps(value)
         with os.fdopen(os.open(write_location, os.O_WRONLY | os.O_CREAT, stat.S_IRUSR | stat.S_IWUSR), 'w') as f:
-            f.write(partial_data)
+            f.write(value)
         os.rename(write_location, dropoff_location)
 
 

awx/main/expect/isolated_manager.py

@@ -324,7 +324,7 @@ class IsolatedManager(object):
 
             path = self.path_to('artifacts', 'stdout')
             if os.path.exists(path):
-                with open(path, 'r') as f:
+                with codecs.open(path, 'r', encoding='utf-8') as f:
                     f.seek(seek)
                     for line in f:
                         self.stdout_handle.write(line)
@@ -419,7 +419,7 @@ class IsolatedManager(object):
             env['ANSIBLE_CACHE_PLUGIN'] = 'jsonfile'
             env['ANSIBLE_CACHE_PLUGIN_CONNECTION'] = facts_path
 
-            buff = StringIO.StringIO()
+            buff = StringIO()
             timeout = max(60, 2 * settings.AWX_ISOLATED_CONNECTION_TIMEOUT)
             status, rc = IsolatedManager.run_pexpect(
                 args, cls.awx_playbook_path(), env, buff,

awx/main/management/commands/generate_isolated_key.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved
 import datetime
+from django.utils.encoding import smart_str
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
@@ -35,10 +36,10 @@ class Command(BaseCommand):
         ).save()
         pemfile = Setting.objects.create(
             key='AWX_ISOLATED_PUBLIC_KEY',
-            value=key.public_key().public_bytes(
+            value=smart_str(key.public_key().public_bytes(
                 encoding=serialization.Encoding.OpenSSH,
                 format=serialization.PublicFormat.OpenSSH
-            ) + " generated-by-awx@%s" % datetime.datetime.utcnow().isoformat()
+            )) + " generated-by-awx@%s" % datetime.datetime.utcnow().isoformat()
         )
         pemfile.save()
         print(pemfile.value)