Merge pull request Lawouach#101 from flaviogrossi/master

Lawouach · Lawouach · commit 9c8d9e59a403 · 2013-09-09T12:13:30.000-07:00
fixed some old references to removed functions enc() and dec()
diff --git a/ws4py/client/__init__.py b/ws4py/client/__init__.py
@@ -243,7 +243,7 @@ def handshake_headers(self):
             ('Host', self.host),
             ('Connection', 'Upgrade'),
             ('Upgrade', 'websocket'),
-            ('Sec-WebSocket-Key', dec(self.key)),
+            ('Sec-WebSocket-Key', self.key.decode('utf-8')),
             ('Origin', self.url),
             ('Sec-WebSocket-Version', str(max(WS_VERSION)))
             ]
@@ -297,7 +297,7 @@ def process_handshake_header(self, headers):
                 raise HandshakeError("Invalid Connection header: %s" % value)
 
             elif header == 'sec-websocket-accept':
-                match = b64encode(sha1(enc(self.key + WS_KEY)).digest())
+                match = b64encode(sha1(self.key.encode('utf-8') + WS_KEY).digest())
                 if value != match.lower():
                     raise HandshakeError("Invalid challenge response: %s" % value)
 
