Update blink web_test for websockets to python 3 compatible

Current websocket handlers used in blink web_test only works with python
2. Update them to python 3 compatible versions to keep them working.

Change-Id: I7d8d4f5b858536de25135a05f5ac84643108318c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2041378
Commit-Queue: Keita Suzuki <suzukikeita@google.com>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Adam Rice <ricea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747115}

third_party/blink/web_tests/http/tests/websocket/bad-handshake-crash_wsh.py

@@ -3,15 +3,15 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += '\xa5:\r\n'
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'\xa5:\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
+
     request.connection.write(msg)
-    print msg
+
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')
 

third_party/blink/web_tests/http/tests/websocket/broken-utf8_wsh.py

@@ -8,7 +8,7 @@ def web_socket_do_extra_handshake(request):
 
 def web_socket_transfer_data(request):
     # '\xff' will never appear in UTF-8 encoded data.
-    payload = 'This text should be ignored. \xff'
+    payload = b'This text should be ignored. \xff'
     request.connection.write(
         stream.create_header(common.OPCODE_TEXT, len(payload), 1, 0, 0, 0, 0) +
         payload)

third_party/blink/web_tests/http/tests/websocket/client-close-expected.txt

@@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 Connected
 Closed
 PASS receivedMessage is undefined.
-PASS closeEvent.reason is "close_frame[:2]='\\x88\\x80'"
+PASS closeEvent.reason is "close_frame[:2]='88 80'"
 PASS closeEvent.wasClean is true
 PASS successfullyParsed is true
 

third_party/blink/web_tests/http/tests/websocket/client-close.html

@@ -32,7 +32,7 @@ ws.onclose = function(event)
     debug("Closed");
     closeEvent = event;
     shouldBeUndefined("receivedMessage");
-    shouldBeEqualToString("closeEvent.reason", "close_frame[:2]='\\x88\\x80'");
+    shouldBeEqualToString("closeEvent.reason", "close_frame[:2]='88 80'");
     shouldBeTrue("closeEvent.wasClean");
     finishJSTest();
 };

third_party/blink/web_tests/http/tests/websocket/client-close_wsh.py

@@ -2,6 +2,7 @@ import struct
 
 from mod_pywebsocket import msgutil
 from mod_pywebsocket import stream
+from mod_pywebsocket import util
 
 
 def web_socket_do_extra_handshake(request):
@@ -16,7 +17,10 @@ def web_socket_transfer_data(request):
 
     # Send only first two bytes of the received frame. The remaining four bytes
     # are "masking key", which changes every time the test runs.
-    data = struct.pack('!H', 1000) + 'close_frame[:2]=%r' % close_frame[:2]
+
+    message = "close_frame[:2]='%s'" % util.hexify(close_frame[:2])
+    data = struct.pack('!H', 1000) + message.encode('UTF-8')
+
     request.connection.write(stream.create_close_frame(data))
 
     # Tell pywebsocket we have sent a close frame to the client, so it can close

third_party/blink/web_tests/http/tests/websocket/close-code-and-reason_wsh.py

@@ -12,9 +12,9 @@ def web_socket_transfer_data(request):
     if line is None:
         return
     if line == '-':
-        data = ''
+        data = b''
     elif line == '--':
-        data = 'X'
+        data = b'X'
     else:
         code, reason = line.split(' ', 1)
         data = struct.pack('!H', int(code)) + reason.encode('utf-8')

third_party/blink/web_tests/http/tests/websocket/close-on-unload_wsh.py

@@ -26,9 +26,8 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import cgi
 import json
+from six.moves.urllib import parse
 from mod_pywebsocket import msgutil
 
 connections = {}
@@ -43,7 +42,7 @@ def web_socket_transfer_data(request):
     r = request.ws_resource.split('?', 1)
     if len(r) == 1:
         return
-    param = cgi.parse_qs(r[1])
+    param = parse.parse_qs(r[1])
     if 'p' not in param:
         return
     page_group = param['p'][0]

third_party/blink/web_tests/http/tests/websocket/close_wsh.py

@@ -28,6 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
+import six
 _GOODBYE_MESSAGE = u'Goodbye'
 
 
@@ -40,7 +41,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.ws_stream.send_message(line, binary=False)
             if line == _GOODBYE_MESSAGE:
                 return

third_party/blink/web_tests/http/tests/websocket/compressed-control-frame_wsh.py

@@ -26,9 +26,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import sys
+import zlib
+
 from mod_pywebsocket import common
 from mod_pywebsocket import stream
-import zlib
 
 
 def web_socket_do_extra_handshake(request):
@@ -38,7 +40,7 @@ def web_socket_do_extra_handshake(request):
 def web_socket_transfer_data(request):
     compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
                                 -zlib.MAX_WBITS)
-    compressed_message = compress.compress('close message')
+    compressed_message = compress.compress(b'close message')
     compressed_message += compress.flush(zlib.Z_SYNC_FLUSH)
     compressed_message = compressed_message[:-4]
     header = stream.create_header(

third_party/blink/web_tests/http/tests/websocket/connection-throttling_wsh.py

-import cgi
+from six.moves.urllib import parse
 import time
 import threading
 
@@ -11,7 +11,7 @@ def web_socket_do_extra_handshake(request):
     query_string = request.ws_resource.split('?', 1)
     if len(query_string) == 1:
         return
-    params = cgi.parse_qs(query_string[1])
+    params = parse.parse_qs(query_string[1])
     mode = params['mode'][0]
     if mode == 'new_test':
         new_test(request)

third_party/blink/web_tests/http/tests/websocket/count-received-bytes_wsh.py

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import codecs
+import six
 
 
 def web_socket_do_extra_handshake(request):
@@ -15,7 +16,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.received_bytes += len(codecs.encode(line, 'utf-8'))
         else:
             request.received_bytes += len(line)

third_party/blink/web_tests/http/tests/websocket/duplicated-headers_wsh.py

@@ -3,16 +3,16 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    message += 'foo: bar, baz\r\n'
-    message += 'foo: hoge\r\n'
-    message += 'FOO: FUGA\r\n'
-    message += 'xxx: yyy\r\n'
-    message += '\r\n'
+    message = (b'HTTP/1.1 101 Switching Protocols\r\n'
+               b'Upgrade: websocket\r\n'
+               b'Connection: Upgrade\r\n'
+               b'Sec-WebSocket-Accept: %s\r\n'
+               b'foo: bar, baz\r\n'
+               b'foo: hoge\r\n'
+               b'FOO: FUGA\r\n'
+               b'xxx: yyy\r\n'
+               b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
+
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/echo-path_wsh.py

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from mod_pywebsocket import common, msgutil
+from mod_pywebsocket import msgutil
 
 
 def web_socket_do_extra_handshake(request):

third_party/blink/web_tests/http/tests/websocket/echo-request-headers_wsh.py

@@ -16,4 +16,7 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    msgutil.send_message(request, json.dumps(dict(request.headers_in.items())))
+    # Since python 3 does not lowercase the dictionary key, manually lower all
+    # keys to maintain python 2/3 compatibility
+    lowered_dict = {header.lower(): value for header, value in request.headers_in.items()}
+    msgutil.send_message(request, json.dumps(lowered_dict))

third_party/blink/web_tests/http/tests/websocket/echo-with-no-extension_wsh.py

@@ -27,6 +27,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import six
+
 _GOODBYE_MESSAGE = u'Goodbye'
 
 
@@ -39,7 +41,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.ws_stream.send_message(line, binary=False)
             if line == _GOODBYE_MESSAGE:
                 return

third_party/blink/web_tests/http/tests/websocket/echo_wsh.py

@@ -27,6 +27,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import six
+
 _GOODBYE_MESSAGE = u'Goodbye'
 
 
@@ -39,7 +41,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.ws_stream.send_message(line, binary=False)
             if line == _GOODBYE_MESSAGE:
                 return

third_party/blink/web_tests/http/tests/websocket/handshake-error_wsh.py

@@ -30,7 +30,7 @@ from mod_pywebsocket import msgutil
 
 
 def web_socket_do_extra_handshake(request):
-    request.connection.write('ThisWillCauseHandshakeError\r\n')
+    request.connection.write(b'ThisWillCauseHandshakeError\r\n')
 
 
 def web_socket_transfer_data(request):

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-extensions-header_wsh.py

@@ -3,13 +3,13 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    message += 'Sec-WebSocket-Extensions: x-foo\r\n'
-    message += '\r\n'
+    message = (b'HTTP/1.1 101 Switching Protocols\r\n'
+               b'Upgrade: websocket\r\n'
+               b'Connection: Upgrade\r\n'
+               b'Sec-WebSocket-Accept: %s\r\n'
+               b'Sec-WebSocket-Extensions: x-foo\r\n'
+               b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
+
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-maxlength_wsh.py

@@ -26,13 +26,13 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 def web_socket_do_extra_handshake(request):
     # This will cause the handshake to fail because it pushes the length of the
     # status line past 1024 characters
-    msg = '.' * 1024
-    msg += 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += '\r\n'
+    msg = (b'%s'
+           b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'\r\n') % (b'.' * 1024, compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0])
+
     request.connection.write(msg)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-mismatch-protocol-header_wsh.py

@@ -3,13 +3,13 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += 'Sec-WebSocket-Protocol: MismatchProtocol\r\n'
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'Sec-WebSocket-Protocol: MismatchProtocol\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
+
     request.connection.write(msg)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-more-accept-header_wsh.py

@@ -3,15 +3,14 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += 'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
+
     request.connection.write(msg)
-    print msg
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')
 

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-more-protocol-header_wsh.py

@@ -3,14 +3,13 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += 'Sec-WebSocket-Protocol: MatchProtocol\r\n'
-    msg += 'Sec-WebSocket-Protocol: MismatchProtocol\r\n'
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'Sec-WebSocket-Protocol: MatchProtocol\r\n'
+           b'Sec-WebSocket-Protocol: MismatchProtocol\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
     request.connection.write(msg)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-no-accept-header_wsh.py

@@ -2,10 +2,7 @@ from mod_pywebsocket import handshake
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += '\r\n'
+    message = b'HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\n\r\n'
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-no-connection-header_wsh.py

@@ -3,14 +3,12 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
     #   Missing 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Upgrade: websocket\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
     request.connection.write(msg)
-    print msg
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')
 

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-no-upgrade-header_wsh.py

@@ -3,14 +3,12 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 Switching Protocols\r\n'
     #   Missing 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += '\r\n'
+    msg = (b'HTTP/1.1 101 Switching Protocols\r\n'
+           b'Connection: Upgrade\r\n'
+           b'Sec-WebSocket-Accept: %s\r\n'
+           b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
     request.connection.write(msg)
-    print msg
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')
 

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-null-subprotocol-selection_wsh.py

@@ -3,12 +3,11 @@ from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    message += '\r\n'
+    message = (b'HTTP/1.1 101 Switching Protocols\r\n'
+               b'Upgrade: websocket\r\n'
+               b'Connection: Upgrade\r\n'
+               b'Sec-WebSocket-Accept: %s\r\n'
+               b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-prepended-null_wsh.py

@@ -19,6 +19,7 @@
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import division
 import time
 from mod_pywebsocket import stream
 from mod_pywebsocket.handshake.hybi import compute_accept
@@ -33,18 +34,17 @@ def web_socket_do_extra_handshake(request):
     frame = stream.create_text_frame('\0Frame-contains-thirty-two-bytes')
 
     msg = frame
-    msg += 'HTTP/1.1 101 Switching Protocols\r\n'
-    msg += 'Upgrade: websocket\r\n'
-    msg += 'Connection: Upgrade\r\n'
-    msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    msg += '\r\n'
+    msg += (b'HTTP/1.1 101 Switching Protocols\r\n'
+            b'Upgrade: websocket\r\n'
+            b'Connection: Upgrade\r\n'
+            b'Sec-WebSocket-Accept: %s\r\n'
+            b'\r\n') % compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0]
     request.connection.write(msg)
     # continue writing data until the client disconnects
     while True:
         time.sleep(1)
         # write over 1024 bytes including the above handshake
-        numFrames = 1024 / len(frame)
+        numFrames = 1024 // len(frame)
         for i in range(0, numFrames):
             request.connection.write(frame)
 

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-unauthorized_wsh.py

@@ -2,9 +2,7 @@ from mod_pywebsocket import handshake
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 401 Unauthorized\r\n'
-    message += 'WWW-Authenticate: Basic realm="Access to staging site"\r\n'
-    message += '\r\n'
+    message = b'HTTP/1.1 401 Unauthorized\r\nWWW-Authenticate: Basic realm="Access to staging site"\r\n\r\n'
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/handshake-fail-by-wrong-accept-header_wsh.py

@@ -2,11 +2,11 @@ from mod_pywebsocket import handshake
 
 
 def web_socket_do_extra_handshake(request):
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += 'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
-    message += '\r\n'
+    message = (b'HTTP/1.1 101 Switching Protocols\r\n'
+               b'Upgrade: websocket\r\n'
+               b'Connection: Upgrade\r\n'
+               b'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
+               b'\r\n')
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/invalid-continuation_wsh.py

@@ -7,8 +7,8 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    payload1 = 'Invalid continuation frame to be ignored.'
-    payload2 = 'Valid frame after closing should be disposed.'
+    payload1 = b'Invalid continuation frame to be ignored.'
+    payload2 = b'Valid frame after closing should be disposed.'
     request.connection.write(
         stream.create_header(common.OPCODE_CONTINUATION,
                              len(payload1), 1, 0, 0, 0, 0) + payload1)

third_party/blink/web_tests/http/tests/websocket/long-invalid-header_wsh.py

@@ -2,9 +2,9 @@ from mod_pywebsocket import handshake
 
 
 def web_socket_do_extra_handshake(request):
-    msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    msg += ('p' * 1024) + '\r\n'
-    msg += '\r\n'
+    msg = b'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
+    msg += (b'p' * 1024) + b'\r\n'
+    msg += b'\r\n'
     request.connection.write(msg)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/permessage-deflate-invalid-parameter_wsh.py

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import urllib
+from six.moves.urllib import parse
 from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
@@ -35,19 +35,16 @@ def web_socket_do_extra_handshake(request):
     resources = request.ws_resource.split('?', 1)
     parameters = None
     if len(resources) == 2:
-        parameters = urllib.unquote(resources[1])
+        parameters = parse.unquote(resources[1])
+    message_parameters = (b'; %s\r\n' % parameters.encode('utf-8') if parameters else b'\r\n')
+
+    message = (b'HTTP/1.1 101 Switching Protocols\r\n'
+               b'Upgrade: websocket\r\n'
+               b'Connection: Upgrade\r\n'
+               b'Sec-WebSocket-Accept: %s\r\n'
+               b'Sec-WebSocket-Extensions: permessage-deflate'
+               b'%s\r\n') % (compute_accept(request.headers_in['Sec-WebSocket-Key'].encode('UTF-8'))[0], message_parameters)
 
-    message = 'HTTP/1.1 101 Switching Protocols\r\n'
-    message += 'Upgrade: websocket\r\n'
-    message += 'Connection: Upgrade\r\n'
-    message += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(
-        request.headers_in['Sec-WebSocket-Key'])[0]
-    message += 'Sec-WebSocket-Extensions: permessage-deflate'
-    if parameters:
-        message += '; %s\r\n' % parameters
-    else:
-        message += '\r\n'
-    message += '\r\n'
     request.connection.write(message)
     # Prevents pywebsocket from sending its own handshake message.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/permessage-deflate-manual_wsh.py

@@ -26,9 +26,10 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import urlparse
+from six.moves.urllib import parse
 import zlib
-from mod_pywebsocket import common, util
+from mod_pywebsocket import common
+from mod_pywebsocket import util
 from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
 from mod_pywebsocket.extensions import ExtensionProcessorInterface
 from mod_pywebsocket.common import ExtensionParameter
@@ -59,7 +60,7 @@ def web_socket_do_extra_handshake(request):
     r = request.ws_resource.split('?', 1)
     if len(r) == 1:
         return
-    parameters = urlparse.parse_qs(r[1], keep_blank_values=True)
+    parameters = parse.parse_qs(r[1], keep_blank_values=True)
     if 'client_max_window_bits' in parameters:
         window_bits = int(parameters['client_max_window_bits'][0])
         processor.set_client_max_window_bits(window_bits)

third_party/blink/web_tests/http/tests/websocket/permessage-deflate-unsolicited-negotiation-response_wsh.py

@@ -26,7 +26,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import urlparse
 from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
 
 

third_party/blink/web_tests/http/tests/websocket/permessage-deflate_wsh.py

@@ -26,7 +26,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import urlparse
+import six
+from six.moves.urllib import parse
+
 from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
 from mod_pywebsocket.extensions import ExtensionProcessorInterface
 from mod_pywebsocket.common import ExtensionParameter
@@ -55,7 +57,7 @@ def web_socket_do_extra_handshake(request):
     r = request.ws_resource.split('?', 1)
     if len(r) == 1:
         return
-    parameters = urlparse.parse_qs(r[1], keep_blank_values=True)
+    parameters = parse.parse_qs(r[1], keep_blank_values=True)
     if 'client_max_window_bits' in parameters:
         window_bits = int(parameters['client_max_window_bits'][0])
         processor.set_client_max_window_bits(window_bits)
@@ -72,7 +74,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             if processor:
                 if line == _ENABLE_MESSAGE:
                     processor.enable_outgoing_compression()

third_party/blink/web_tests/http/tests/websocket/pong_wsh.py

-import cgi
+from six.moves.urllib import parse
 from mod_pywebsocket import common
 from mod_pywebsocket import msgutil
 
@@ -11,7 +11,7 @@ def web_socket_transfer_data(request):
     send_payload = ''
     r = request.ws_resource.split('?', 1)
     if len(r) == 2:
-        params = cgi.parse_qs(r[1])
+        params = parse.parse_qs(r[1])
         if 'payload' in params:
             send_payload = params['payload'][0]
 
@@ -21,8 +21,8 @@ def web_socket_transfer_data(request):
     # client.
     opcode, recv_payload, final, reserved1, reserved2, reserved3 = \
         request.ws_stream._receive_frame()
-    if (opcode == common.OPCODE_PONG and recv_payload == send_payload and
-            final and not reserved1 and not reserved2 and not reserved3):
+    if (opcode == common.OPCODE_PONG and recv_payload.decode('UTF-8') == send_payload and final and not reserved1 and not reserved2
+            and not reserved3):
         msgutil.send_message(request, 'PASS')
     else:
         msgutil.send_message(

third_party/blink/web_tests/http/tests/websocket/protocol-test_wsh.py

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import cgi
+from six.moves.urllib import parse
 from mod_pywebsocket import msgutil
 
 
@@ -34,7 +34,7 @@ def web_socket_do_extra_handshake(request):
     r = request.ws_resource.split('?', 1)
     if len(r) == 1:
         return
-    param = cgi.parse_qs(r[1])
+    param = parse.parse_qs(r[1])
     if 'protocol' in param:
         request.ws_protocol = param['protocol'][0]
 

third_party/blink/web_tests/http/tests/websocket/receive-pong-with-payload_wsh.py

@@ -3,6 +3,6 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    request.ws_stream._send_pong("{payload: 'yes'}")
+    request.ws_stream._send_pong(b"{payload: 'yes'}")
     request.ws_stream.send_message('sent pong')
     line = request.ws_stream.receive_message()

third_party/blink/web_tests/http/tests/websocket/reserved-bits_wsh.py

 import re
 from mod_pywebsocket import common
 from mod_pywebsocket import stream
-from mod_pywebsocket.extensions import DeflateFrameExtensionProcessor
+from mod_pywebsocket import msgutil
 
 bit = 0
 
 
-def _get_deflate_frame_extension_processor(request):
-    for extension_processor in request.ws_extension_processors:
-        if isinstance(extension_processor, DeflateFrameExtensionProcessor):
-            return extension_processor
-    return None
-
-
 def web_socket_do_extra_handshake(request):
     match = re.search(r'\?compressed=(true|false)&bitNumber=(\d)$',
                       request.ws_resource)
@@ -24,18 +17,11 @@ def web_socket_do_extra_handshake(request):
     global bit
     compressed = match.group(1)
     bit = int(match.group(2))
-    if compressed == 'false':
-        request.ws_extension_processors = []  # using no extension response
-    else:
-        processor = _get_deflate_frame_extension_processor(request)
-        if processor is None:
-            request.ws_extension_processors = []  # using no extension response
-        else:
-            request.ws_extension_processors = [processor]  # avoid conflict
+    request.ws_extension_processors = []  # using no extension response
 
 
 def web_socket_transfer_data(request):
-    text = 'This message should be ignored.'
+    text = b'This message should be ignored.'
     opcode = common.OPCODE_TEXT
     if bit == 1:
         frame = stream.create_header(opcode, len(text), 1, 1, 0, 0, 0) + text

third_party/blink/web_tests/http/tests/websocket/reserved-opcodes_wsh.py

@@ -16,6 +16,6 @@ def web_socket_transfer_data(request):
         return
 
     opcode = int(match.group(1))
-    payload = 'This text should be ignored. (opcode = %d)' % opcode
+    payload = b'This text should be ignored. (opcode = %d)' % opcode
     request.connection.write(
         stream.create_header(opcode, len(payload), 1, 0, 0, 0, 0) + payload)

third_party/blink/web_tests/http/tests/websocket/set-cookie_wsh.py

@@ -26,13 +26,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import urlparse
+from six.moves.urllib import parse
 
 
 def web_socket_do_extra_handshake(request):
-    query = urlparse.urlparse(request.uri)[4]
+    query = parse.urlparse(request.uri)[4]
     max_age = ''
-    if 'clear' in urlparse.parse_qs(query):
+    if 'clear' in parse.parse_qs(query):
         max_age = '; Max-Age=0'
     cookie_values = [
         'ws-domain-local-ip=1; Domain=127.0.0.1' + max_age,

third_party/blink/web_tests/http/tests/websocket/unmasked-frames_wsh.py

@@ -37,7 +37,7 @@ def web_socket_transfer_data(request):
 
     # Send a masked close frame. Clients should be able to handle this frame
     # and the WebSocket object should be closed cleanly.
-    request.connection.write(stream.create_close_frame('', mask=False))
+    request.connection.write(stream.create_close_frame(b'', mask=False))
 
     # Prevents pywebsocket from starting its own closing handshake.
     raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/workers/resources/no-onmessage-in-sync-op_wsh.py

+import six
+
 from mod_pywebsocket import handshake
 from mod_pywebsocket import msgutil
 
@@ -14,5 +16,5 @@ def web_socket_transfer_data(request):
 
     for expected in (u'1', u'2', u'3'):
         message = msgutil.receive_message(request)
-        if type(message) != unicode or message != expected:
+        if not isinstance(message, six.text_type) or message != expected:
             raise handshake.AbortedByUserException('Abort the connection')

third_party/blink/web_tests/http/tests/websocket/workers/resources/protocol-test_wsh.py

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import cgi
+from six.moves.urllib import parse
 from mod_pywebsocket import msgutil
 
 
@@ -34,7 +34,7 @@ def web_socket_do_extra_handshake(request):
     r = request.ws_resource.split('?', 1)
     if len(r) == 1:
         return
-    param = cgi.parse_qs(r[1])
+    param = parse.parse_qs(r[1])
     if 'protocol' in param:
         request.ws_protocol = param['protocol'][0]
 

third_party/blink/web_tests/http/tests/websocket/zero-length-text_wsh.py

@@ -7,9 +7,9 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    payload1 = 'This first text should be received.'
-    payload2 = 'This second text '
-    payload3 = 'should be received, too.'
+    payload1 = b'This first text should be received.'
+    payload2 = b'This second text '
+    payload3 = b'should be received, too.'
 
     # send ''
     request.connection.write(