crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #155 from kanaka/bug/154-no-implicit-relative-imports 

Don't use implicit relative imports
This commit is contained in:
Solly 2015-02-06 11:29:57 -05:00
parent 999a133bc5 acd276e1a2
commit 23045cb212
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websockify/__init__.py
View File

@ -1,2 +1,2 @@
from websocket import * from websockify.websocket import *
from websocketproxy import * from websockify.websocketproxy import *

2
websockify/websocketproxy.py
View File

@ -17,7 +17,7 @@ except: from SocketServer import ForkingMixIn
try: from http.server import HTTPServer try: from http.server import HTTPServer
except: from BaseHTTPServer import HTTPServer except: from BaseHTTPServer import HTTPServer
from select import select from select import select
import websocket from websockify import websocket
try: try:
from urllib.parse import parse_qs, urlparse from urllib.parse import parse_qs, urlparse
except: except: