summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2015-02-03 16:51:01 -0500
committerSolly Ross <sross@redhat.com>2015-02-03 16:52:29 -0500
commitacd276e1a2aea466c6bac125adec83cf56878638 (patch)
tree47778ccac70abfa0f47128c2c31ebc93c266d5fc
parent999a133bc5ae4c641d75fceb3c18bcba4af16170 (diff)
downloadwebsockify-bug/154-no-implicit-relative-imports.tar.gz
Don't use implicit relative importsbug/154-no-implicit-relative-imports
Implicit relative imports don't work in Python 3. This converts implicit relative imports into absolute imports (e.g. `import websocket` becomes `from websockify import websocket`). Fixes #154
-rw-r--r--websockify/__init__.py4
-rwxr-xr-xwebsockify/websocketproxy.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/websockify/__init__.py b/websockify/__init__.py
index e8f2eaf..37a6f47 100644
--- a/websockify/__init__.py
+++ b/websockify/__init__.py
@@ -1,2 +1,2 @@
-from websocket import *
-from websocketproxy import *
+from websockify.websocket import *
+from websockify.websocketproxy import *
diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index 17d9451..ac9ed63 100755
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -17,7 +17,7 @@ except: from SocketServer import ForkingMixIn
try: from http.server import HTTPServer
except: from BaseHTTPServer import HTTPServer
from select import select
-import websocket
+from websockify import websocket
try:
from urllib.parse import parse_qs, urlparse
except: