Fix for Python 3

TODO.goals

@@ -1,11 +1,10 @@
 Release 0.6.1 #41 #52
-    Run README commands
-    Fix for Python 3
     Merge sarietta's pull request
 Add Websocket transport
     Update proxy to include websocket depending on argument
     Use prepared request to get headers from http_session
     Include https://github.com/invisibleroads/socketIO-client/issues/68
+Add test for on_reconnect using sarietta's bash scripts
 Consider logging packets sent and received
 Implement rooms #65
 Implement binary event

socketIO_client/__init__.py

@@ -84,7 +84,7 @@ class EngineIO(LoggingMixin):
 
     def _reset_heartbeat(self):
         try:
-            self._heartbeat_thread.stop()
+            self._heartbeat_thread.halt()
         except AttributeError:
             pass
         ping_interval = self._engineIO_session.ping_interval
@@ -150,7 +150,7 @@ class EngineIO(LoggingMixin):
 
     def _close(self):
         self._wants_to_close = True
-        self._heartbeat_thread.stop()
+        self._heartbeat_thread.halt()
         if not self._opened:
             return
         engineIO_packet_type = 1

socketIO_client/heartbeats.py

@@ -17,11 +17,11 @@ class HeartbeatThread(Thread):
         self._hurry_interval_in_seconds = hurry_interval_in_seconds
         self._adrenaline = Event()
         self._rest = Event()
-        self._stop = Event()
+        self._halt = Event()
 
     def run(self):
         try:
-            while not self._stop.is_set():
+            while not self._halt.is_set():
                 try:
                     self._send_heartbeat()
                 except TimeoutError:
@@ -42,6 +42,6 @@ class HeartbeatThread(Thread):
         self._rest.set()
         self._rest.clear()
 
-    def stop(self):
+    def halt(self):
         self._rest.set()
-        self._stop.set()
+        self._halt.set()

socketIO_client/parsers.py

@@ -30,11 +30,11 @@ def parse_engineIO_session(engineIO_packet_data):
 
 
 def encode_engineIO_content(engineIO_packets):
-    parts = []
+    content = bytearray()
     for packet_type, packet_data in engineIO_packets:
-        packet_string = str(packet_type) + encode_string(packet_data)
+        packet_string = encode_string(str(packet_type) + packet_data)
-        parts.append(_make_packet_header(packet_string) + packet_string)
+        content.extend(_make_packet_header(packet_string) + packet_string)
-    return ''.join(parts)
+    return content
 
 
 def decode_engineIO_content(content):
@@ -100,11 +100,11 @@ def get_namespace_path(socketIO_packet_data):
 
 def _make_packet_header(packet_string):
     length_string = str(len(packet_string))
-    header_digits = [0]
+    header_digits = bytearray([0])
     for i in range(len(length_string)):
         header_digits.append(ord(length_string[i]) - 48)
     header_digits.append(255)
-    return ''.join(chr(x) for x in header_digits)
+    return header_digits
 
 
 def _read_packet_length(content, content_index):

socketIO_client/transports.py

@@ -68,7 +68,7 @@ class XHR_PollingTransport(AbstractTransport):
                 (engineIO_packet_type, engineIO_packet_data),
             ]),
             **self.kw_post)
-        assert response.content == 'ok'
+        assert response.content == b'ok'
 
     def _get_timestamp(self):
         timestamp = '%s-%s' % (int(time.time() * 1000), self.request_index)