Fixed missing Six module import

Raider-Arts · Apr 14, 2021 · adcebed · adcebed
1 parent 9525c33
commit adcebed
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/megascan_link_python/__init__.py b/megascan_link_python/__init__.py
@@ -50,7 +50,7 @@ def openSettingsDialog():
 	dialog = dialogs.SettingsDialog(Data.socket,mainWindow)
 	dialog.show()
 
-def createToolBar():
+def createToolBar(): 
 	"""Creates the toolbar containing the action to open the Settings Dialog
 	"""    
 	Data.toolbar = sbsui.add_toolbar("Megscan Link", "megascanlink")

diff --git a/megascan_link_python/websocket/_abnf.py b/megascan_link_python/websocket/_abnf.py
@@ -26,7 +26,7 @@
 import os
 import struct
 
-import six
+from . import six
 
 from ._exceptions import *
 from ._utils import validate_utf8

diff --git a/megascan_link_python/websocket/_app.py b/megascan_link_python/websocket/_app.py
@@ -29,7 +29,7 @@
 import time
 import traceback
 
-import six
+from . import six
 
 from ._abnf import ABNF
 from ._core import WebSocket, getdefaulttimeout

diff --git a/megascan_link_python/websocket/_core.py b/megascan_link_python/websocket/_core.py
@@ -30,7 +30,7 @@
 import threading
 import time
 
-import six
+from . import six
 
 # websocket modules
 from ._abnf import *

diff --git a/megascan_link_python/websocket/_handshake.py b/megascan_link_python/websocket/_handshake.py
@@ -22,7 +22,7 @@
 import hmac
 import os
 
-import six
+from . import six
 
 from ._cookiejar import SimpleCookieJar
 from ._exceptions import *

diff --git a/megascan_link_python/websocket/_http.py b/megascan_link_python/websocket/_http.py
@@ -23,7 +23,7 @@
 import socket
 import sys
 
-import six
+from . import six
 
 from ._exceptions import *
 from ._logging import *

diff --git a/megascan_link_python/websocket/_socket.py b/megascan_link_python/websocket/_socket.py
@@ -26,7 +26,7 @@
 import select
 import socket
 
-import six
+from . import six
 import sys
 
 from ._exceptions import *

diff --git a/megascan_link_python/websocket/_url.py b/megascan_link_python/websocket/_url.py
@@ -26,7 +26,7 @@
 import socket
 import struct
 
-from six.moves.urllib.parse import urlparse
+from . import six
 
 
 __all__ = ["parse_url", "get_proxy_info"]
@@ -47,7 +47,7 @@ def parse_url(url):
 
     scheme, url = url.split(":", 1)
 
-    parsed = urlparse(url, scheme="ws")
+    parsed = six.moves.urllib.parse.urlparse(url, scheme="ws")
     if parsed.hostname:
         hostname = parsed.hostname
     else:
@@ -171,7 +171,7 @@ def get_proxy_info(
     for key in env_keys:
         value = os.environ.get(key, None)
         if value:
-            proxy = urlparse(value)
+            proxy = six.moves.urllib.parse.urlparse(value)
             auth = (proxy.username, proxy.password) if proxy.username else None
             return proxy.hostname, proxy.port, auth
 

diff --git a/megascan_link_python/websocket/_utils.py b/megascan_link_python/websocket/_utils.py
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 """
-import six
+from . import six
 
 __all__ = ["NoLock", "validate_utf8", "extract_err_message", "extract_error_code"]