From 845e4a2426876c782bb083284efbfe93e2848287 Mon Sep 17 00:00:00 2001 From: Radek Podgorny Date: Tue, 30 Sep 2014 12:29:26 +0200 Subject: [PATCH 1/2] updated websockify to be compatible with python3 --- utils/websockify | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/websockify b/utils/websockify index 7b3ec111..17d94519 100755 --- a/utils/websockify +++ b/utils/websockify @@ -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) From 6ab5121d9ac808a3e40ce6c0d3b92e81b4536be8 Mon Sep 17 00:00:00 2001 From: Radek Podgorny Date: Tue, 30 Sep 2014 13:50:43 +0200 Subject: [PATCH 2/2] fix another python3 compatility in websocket --- utils/websocket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/websocket.py b/utils/websocket.py index 67f5aef6..8e27e563 100644 --- a/utils/websocket.py +++ b/utils/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)