diff options
| author | Solly <directxman12+github@gmail.com> | 2015-02-06 11:29:57 -0500 |
|---|---|---|
| committer | Solly <directxman12+github@gmail.com> | 2015-02-06 11:29:57 -0500 |
| commit | 23045cb212a26bb41ca8894609239fb162540097 (patch) | |
| tree | 47778ccac70abfa0f47128c2c31ebc93c266d5fc | |
| parent | 999a133bc5ae4c641d75fceb3c18bcba4af16170 (diff) | |
| parent | acd276e1a2aea466c6bac125adec83cf56878638 (diff) | |
| download | websockify-23045cb212a26bb41ca8894609239fb162540097.tar.gz | |
Merge pull request #155 from kanaka/bug/154-no-implicit-relative-imports
Don't use implicit relative imports
| -rw-r--r-- | websockify/__init__.py | 4 | ||||
| -rwxr-xr-x | 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: |