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

Merge pull request #140 from rpodgorny/python3 

python3 compatibility fixes
This commit is contained in:
Joel Martin 2014-10-02 10:02:11 -05:00
parent 63209f84ca 303a71310c
commit f36877c684
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
websockify/websocket.py
View File

@ -388,7 +388,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
def send_close(self, code=1000, reason=''):
""" Send a WebSocket orderly close frame. """
msg = pack(">H%ds" % len(reason), code, reason)
msg = pack(">H%ds" % len(reason), code, s2b(reason))
buf, h, t = self.encode_hybi(msg, opcode=0x08, base64=False)
self.request.send(buf)

6
websockify/websocketproxy.py
View File

@ -90,7 +90,7 @@ Traffic Legend:
# Extract the token parameter from url
args = parse_qs(urlparse(path)[4]) # 4 is the query from url
if not args.has_key('token') or not len(args['token']):
if not 'token' in args or not len(args['token']):
raise self.EClose("Token not present")
token = args['token'][0].rstrip('\n')
@ -105,14 +105,14 @@ Traffic Legend:
targets = {}
for f in cfg_files:
for line in [l.strip() for l in file(f).readlines()]:
for line in [l.strip() for l in open(f).readlines()]:
if line and not line.startswith('#'):
ttoken, target = line.split(': ')
targets[ttoken] = target.strip()
self.vmsg("Target config: %s" % repr(targets))
if targets.has_key(token):
if token in targets:
return targets[token].split(':')
else:
raise self.EClose("Token '%s' not found" % token)