Use the correct text type for upgrade probes in both Python 2 and 3 (#…

…101) Without this, Python 2 chooses binary mode. Fixes #265.
miguelgrinberg · Mar 15, 2019 · 4f0b4ea · 4f0b4ea
1 parent 66290a5
commit 4f0b4ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/engineio/client.py b/engineio/client.py
@@ -347,7 +347,7 @@ def _connect_websocket(self, url, headers, engineio_path):
             else:
                 raise exceptions.ConnectionError('Connection error')
         if upgrade:
-            p = packet.Packet(packet.PING, data='probe').encode()
+            p = packet.Packet(packet.PING, data=six.text_type('probe')).encode()
             try:
                 ws.send(p)
             except Exception as e:  # pragma: no cover

diff --git a/tests/common/test_client.py b/tests/common/test_client.py
@@ -545,7 +545,7 @@ def test_websocket_upgrade_no_pong(self, create_connection):
     @mock.patch('engineio.client.websocket.create_connection')
     def test_websocket_upgrade_successful(self, create_connection):
         create_connection.return_value.recv.return_value = packet.Packet(
-            packet.PONG, 'probe').encode()
+            packet.PONG, six.text_type('probe')).encode()
         c = client.Client()
         c.sid = '123'
         c.base_url = 'http://foo'
@@ -571,7 +571,7 @@ def test_websocket_upgrade_successful(self, create_connection):
         self.assertEqual(c.ws, create_connection.return_value)
         self.assertEqual(
             create_connection.return_value.send.call_args_list[0],
-            ((packet.Packet(packet.PING, 'probe').encode(),),))  # ping
+            ((packet.Packet(packet.PING, six.text_type('probe')).encode(),),))  # ping
         self.assertEqual(
             create_connection.return_value.send.call_args_list[1],
             ((packet.Packet(packet.UPGRADE).encode(),),))  # upgrade