From acd276e1a2aea466c6bac125adec83cf56878638 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Tue, 3 Feb 2015 16:51:01 -0500 Subject: [PATCH] Don't use 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 --- websockify/__init__.py | 4 ++-- websockify/websocketproxy.py | 2 +- 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: