External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

clean up unnecessary usage of the six library (awx only supports py3)

Browse Source
This commit is contained in:
Ryan Petrello
2019-01-24 17:57:08 -05:00
parent 68950d56ca
commit daeeaf413a
58 changed files with 238 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/utils/handlers.py
View File

@@ -8,7 +8,6 @@ import requests
import time
import socket
import select
import six
from urllib import parse as urlparse
from concurrent.futures import ThreadPoolExecutor
from requests.exceptions import RequestException
@@ -211,7 +210,7 @@ def _encode_payload_for_socket(payload):
encoded_payload = payload
if isinstance(encoded_payload, dict):
encoded_payload = json.dumps(encoded_payload, ensure_ascii=False)
if isinstance(encoded_payload, six.text_type):
if isinstance(encoded_payload, str):
encoded_payload = encoded_payload.encode('utf-8')
return encoded_payload
@@ -237,7 +236,7 @@ class TCPHandler(BaseHandler):
except Exception as e:
ret = SocketResult(False, "Error sending message from %s: %s" %
(TCPHandler.__name__,
' '.join(six.text_type(arg) for arg in e.args)))
' '.join(str(arg) for arg in e.args)))
logger.exception(ret.reason)
finally:
sok.close()