From aba75bfec4dba6aae808ccdacf680e3072ace1a7 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 14 Apr 2014 16:53:18 -0400
Subject: [PATCH] This should probably be unicode.

---
 tests/test_websocket.py | 2 +-
 websocket/__init__.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_websocket.py b/tests/test_websocket.py
index d67697b..29cb0d2 100644
--- a/tests/test_websocket.py
+++ b/tests/test_websocket.py
@@ -165,7 +165,7 @@ class WebSocketTest(unittest.TestCase):
     def testWSKey(self):
         key = ws._create_sec_websocket_key()
         self.assert_(key != 24)
-        self.assert_("¥n".encode('utf-8') not in key)
+        self.assert_("¥n" not in key)
 
     def testWsUtils(self):
         sock = ws.WebSocket()
diff --git a/websocket/__init__.py b/websocket/__init__.py
index 13ec2b5..3c4d718 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -232,7 +232,7 @@ _MAX_CHAR_BYTE = (1<<8) -1
 
 def _create_sec_websocket_key():
     uid = uuid.uuid4()
-    return base64.encodestring(uid.bytes).strip()
+    return base64.encodestring(uid.bytes).decode('utf-8').strip()
 
 
 _HEADERS_TO_CHECK = {