support the new CLI in py2 *and* py3

This commit is contained in:
Ryan Petrello
2019-08-19 17:59:49 -04:00
parent 2cdd007ed0
commit 80b4102aa9
21 changed files with 154 additions and 52 deletions

View File

@@ -1,11 +1,12 @@
from queue import Queue, Empty
import time
import threading
import logging
import atexit
import json
import ssl
import urllib.parse
from six.moves.queue import Queue, Empty
from six.moves.urllib.parse import urlparse
from awxkit.config import config
@@ -55,7 +56,7 @@ class WSClient(object):
import websocket
if not hostname:
result = urllib.parse.urlparse(config.base_url)
result = urlparse(config.base_url)
secure = result.scheme == 'https'
port = result.port
if port is None: