From 303a71310cc42c6c1ab6808670289948b466bbdc Mon Sep 17 00:00:00 2001 From: Radek Podgorny Date: Thu, 2 Oct 2014 11:42:17 +0200 Subject: [PATCH] python3 compatibility fixes --- websockify/websocket.py | 2 +- websockify/websocketproxy.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/websockify/websocket.py b/websockify/websocket.py index d161f64..1b3dca9 100644 --- a/websockify/websocket.py +++ b/websockify/websocket.py @@ -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) diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index 7b3ec11..17d9451 100755 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -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)