openstack/deb-python-websocket-client
Code Issues Proposed changes

python 2.6 support

Browse Source
This commit is contained in:
liris
2015-10-27 16:17:35 +09:00
parent a7dd293a87
commit e6ed0161ef
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
websocket/_handshake.py
View File

@@ -30,6 +30,7 @@ import uuid
import hashlib import hashlib
import hmac import hmac
import os import os
import sys
from ._logging import * from ._logging import *
from ._url import * from ._url import *
@@ -148,7 +149,11 @@ def _validate(headers, key, subprotocols):
value = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").encode('utf-8') value = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").encode('utf-8')
hashed = base64encode(hashlib.sha1(value).digest()).strip().lower() hashed = base64encode(hashlib.sha1(value).digest()).strip().lower()
success = hmac.compare_digest(hashed, result) if sys.version_info[0] == 2 and sys.version_info[1] < 7:
success = (hashed == result)
else:
success = hmac.compare_digest(hashed, result)
if success: if success:
return True, subproto return True, subproto
else: else: