Remove dependency on the six package

miguelgrinberg · miguelgrinberg · commit f6eeedb76761 · 2020-12-07T23:26:45.000Z
diff --git a/setup.py b/setup.py
@@ -29,7 +29,6 @@
     include_package_data=True,
     platforms='any',
     install_requires=[
-        'six>=1.9.0',
         'bidict>=0.21.0',
         'python-engineio>=3.13.0,<4'
     ],
diff --git a/socketio/asyncio_client.py b/socketio/asyncio_client.py
@@ -3,7 +3,6 @@
 import random
 
 import engineio
-import six
 
 from . import client
 from . import exceptions
@@ -100,7 +99,7 @@ async def connect(self, url, headers={}, transports=None,
                 set(self.namespace_handlers.keys())))
             if len(namespaces) == 0:
                 namespaces = ['/']
-        elif isinstance(namespaces, six.string_types):
+        elif isinstance(namespaces, str):
             namespaces = [namespaces]
         self.connection_namespaces = namespaces
         try:
@@ -111,7 +110,7 @@ async def connect(self, url, headers={}, transports=None,
             await self._trigger_event(
                 'connect_error', '/',
                 exc.args[1] if len(exc.args) > 1 else exc.args[0])
-            six.raise_from(exceptions.ConnectionError(exc.args[0]), None)
+            raise exceptions.ConnectionError(exc.args[0]) from None
         self.connected = True
 
     async def wait(self):
@@ -237,7 +236,7 @@ def event_callback(*args):
         try:
             await asyncio.wait_for(callback_event.wait(), timeout)
         except asyncio.TimeoutError:
-            six.raise_from(exceptions.TimeoutError(), None)
+            raise exceptions.TimeoutError() from None
         return callback_args[0] if len(callback_args[0]) > 1 \
             else callback_args[0][0] if len(callback_args[0]) == 1 \
             else None
diff --git a/socketio/asyncio_pubsub_manager.py b/socketio/asyncio_pubsub_manager.py
@@ -3,7 +3,6 @@
 
 import json
 import pickle
-import six
 
 from .asyncio_manager import AsyncManager
 
@@ -157,7 +156,7 @@ async def _thread(self):
             if isinstance(message, dict):
                 data = message
             else:
-                if isinstance(message, six.binary_type):  # pragma: no cover
+                if isinstance(message, bytes):  # pragma: no cover
                     try:
                         data = pickle.loads(message)
                     except:
diff --git a/socketio/asyncio_server.py b/socketio/asyncio_server.py
@@ -1,7 +1,6 @@
 import asyncio
 
 import engineio
-import six
 
 from . import asyncio_manager
 from . import exceptions
@@ -228,7 +227,7 @@ def event_callback(*args):
         try:
             await asyncio.wait_for(callback_event.wait(), timeout)
         except asyncio.TimeoutError:
-            six.raise_from(exceptions.TimeoutError(), None)
+            raise exceptions.TimeoutError() from None
         return callback_args[0] if len(callback_args[0]) > 1 \
             else callback_args[0][0] if len(callback_args[0]) == 1 \
             else None
diff --git a/socketio/base_manager.py b/socketio/base_manager.py
@@ -2,7 +2,6 @@
 import logging
 
 from bidict import bidict
-import six
 
 default_logger = logging.getLogger('socketio')
 
@@ -35,7 +34,7 @@ def initialize(self):
 
     def get_namespaces(self):
         """Return an iterable with the active namespace names."""
-        return six.iterkeys(self.rooms)
+        return self.rooms.keys()
 
     def get_participants(self, namespace, room):
         """Return an iterable with the active participants in a room."""
@@ -83,7 +82,7 @@ def disconnect(self, sid, namespace):
         if namespace not in self.rooms:
             return
         rooms = []
-        for room_name, room in six.iteritems(self.rooms[namespace].copy()):
+        for room_name, room in self.rooms[namespace].copy().items():
             if sid in room:
                 rooms.append(room_name)
         for room in rooms:
@@ -129,7 +128,7 @@ def get_rooms(self, sid, namespace):
         """Return the rooms a client is in."""
         r = []
         try:
-            for room_name, room in six.iteritems(self.rooms[namespace]):
+            for room_name, room in self.rooms[namespace].items():
                 if room_name is not None and sid in room:
                     r.append(room_name)
         except KeyError:
@@ -169,7 +168,7 @@ def _generate_ack_id(self, sid, callback):
         """Generate a unique identifier for an ACK packet."""
         if sid not in self.callbacks:
             self.callbacks[sid] = {0: itertools.count(1)}
-        id = six.next(self.callbacks[sid][0])
+        id = next(self.callbacks[sid][0])
         self.callbacks[sid][id] = callback
         return id
 
diff --git a/socketio/client.py b/socketio/client.py
@@ -5,7 +5,6 @@
 import threading
 
 import engineio
-import six
 
 from . import exceptions
 from . import namespace
@@ -268,7 +267,7 @@ def connect(self, url, headers={}, transports=None,
                 set(self.namespace_handlers.keys())))
             if len(namespaces) == 0:
                 namespaces = ['/']
-        elif isinstance(namespaces, six.string_types):
+        elif isinstance(namespaces, str):
             namespaces = [namespaces]
         self.connection_namespaces = namespaces
         try:
@@ -278,7 +277,7 @@ def connect(self, url, headers={}, transports=None,
             self._trigger_event(
                 'connect_error', '/',
                 exc.args[1] if len(exc.args) > 1 else exc.args[0])
-            six.raise_from(exceptions.ConnectionError(exc.args[0]), None)
+            raise exceptions.ConnectionError(exc.args[0]) from None
         self.connected = True
 
     def wait(self):
@@ -471,7 +470,7 @@ def _generate_ack_id(self, namespace, callback):
         namespace = namespace or '/'
         if namespace not in self.callbacks:
             self.callbacks[namespace] = {0: itertools.count(1)}
-        id = six.next(self.callbacks[namespace][0])
+        id = next(self.callbacks[namespace][0])
         self.callbacks[namespace][id] = callback
         return id
 
diff --git a/socketio/packet.py b/socketio/packet.py
@@ -1,8 +1,6 @@
 import functools
 import json as _json
 
-import six
-
 (CONNECT, DISCONNECT, EVENT, ACK, CONNECT_ERROR, BINARY_EVENT, BINARY_ACK) = \
     (0, 1, 2, 3, 4, 5, 6)
 packet_names = ['CONNECT', 'DISCONNECT', 'EVENT', 'ACK', 'CONNECT_ERROR',
@@ -49,10 +47,10 @@ def encode(self):
         of packets where the first is the original packet with placeholders for
         the binary components and the remaining ones the binary attachments.
         """
-        encoded_packet = six.text_type(self.packet_type)
+        encoded_packet = str(self.packet_type)
         if self.packet_type == BINARY_EVENT or self.packet_type == BINARY_ACK:
             data, attachments = self._deconstruct_binary(self.data)
-            encoded_packet += six.text_type(len(attachments)) + '-'
+            encoded_packet += str(len(attachments)) + '-'
         else:
             data = self.data
             attachments = None
@@ -64,7 +62,7 @@ def encode(self):
             if needs_comma:
                 encoded_packet += ','
                 needs_comma = False
-            encoded_packet += six.text_type(self.id)
+            encoded_packet += str(self.id)
         if data is not None:
             if needs_comma:
                 encoded_packet += ','
@@ -139,7 +137,7 @@ def _reconstruct_binary_internal(self, data, attachments):
             else:
                 return {key: self._reconstruct_binary_internal(value,
                                                                attachments)
-                        for key, value in six.iteritems(data)}
+                        for key, value in data.items()}
         else:
             return data
 
@@ -150,21 +148,21 @@ def _deconstruct_binary(self, data):
         return data, attachments
 
     def _deconstruct_binary_internal(self, data, attachments):
-        if isinstance(data, six.binary_type):
+        if isinstance(data, bytes):
             attachments.append(data)
             return {'_placeholder': True, 'num': len(attachments) - 1}
         elif isinstance(data, list):
             return [self._deconstruct_binary_internal(item, attachments)
                     for item in data]
         elif isinstance(data, dict):
             return {key: self._deconstruct_binary_internal(value, attachments)
-                    for key, value in six.iteritems(data)}
+                    for key, value in data.items()}
         else:
             return data
 
     def _data_is_binary(self, data):
         """Check if the data contains binary components."""
-        if isinstance(data, six.binary_type):
+        if isinstance(data, bytes):
             return True
         elif isinstance(data, list):
             return functools.reduce(
@@ -173,7 +171,7 @@ def _data_is_binary(self, data):
         elif isinstance(data, dict):
             return functools.reduce(
                 lambda a, b: a or b, [self._data_is_binary(item)
-                                      for item in six.itervalues(data)],
+                                      for item in data.values()],
                 False)
         else:
             return False
diff --git a/socketio/pubsub_manager.py b/socketio/pubsub_manager.py
@@ -3,7 +3,6 @@
 
 import json
 import pickle
-import six
 
 from .base_manager import BaseManager
 
@@ -148,7 +147,7 @@ def _thread(self):
             if isinstance(message, dict):
                 data = message
             else:
-                if isinstance(message, six.binary_type):  # pragma: no cover
+                if isinstance(message, bytes):  # pragma: no cover
                     try:
                         data = pickle.loads(message)
                     except:
diff --git a/socketio/server.py b/socketio/server.py
@@ -1,7 +1,6 @@
 import logging
 
 import engineio
-import six
 
 from . import base_manager
 from . import exceptions
diff --git a/socketio/zmq_manager.py b/socketio/zmq_manager.py
@@ -5,7 +5,6 @@
     import eventlet.green.zmq as zmq
 except ImportError:
     zmq = None
-import six
 
 from .pubsub_manager import PubSubManager
 
@@ -98,7 +97,7 @@ def zmq_listen(self):
 
     def _listen(self):
         for message in self.zmq_listen():
-            if isinstance(message, six.binary_type):
+            if isinstance(message, bytes):
                 try:
                     message = pickle.loads(message)
                 except Exception:
diff --git a/tests/asyncio/test_asyncio_client.py b/tests/asyncio/test_asyncio_client.py
@@ -2,20 +2,15 @@
 from contextlib import contextmanager
 import sys
 import unittest
+from unittest import mock
 
-import six
-
-if six.PY3:
-    from unittest import mock
-else:
-    import mock
+import pytest
 
 from socketio import asyncio_client
 from socketio import asyncio_namespace
 from engineio import exceptions as engineio_exceptions
 from socketio import exceptions
 from socketio import packet
-import pytest
 
 
 def AsyncMock(*args, **kwargs):
@@ -371,6 +366,7 @@ def test_send_with_defaults(self):
     def test_call(self):
         c = asyncio_client.AsyncClient()
         c.namespaces = {'/': '1'}
+
         async def fake_event_wait():
             c._generate_ack_id.call_args_list[0][0][1]('foo', 321)
 
diff --git a/tests/asyncio/test_asyncio_manager.py b/tests/asyncio/test_asyncio_manager.py
@@ -1,13 +1,7 @@
 import asyncio
 import sys
 import unittest
-
-import six
-
-if six.PY3:
-    from unittest import mock
-else:
-    import mock
+from unittest import mock
 
 from socketio import asyncio_manager
 
diff --git a/tests/asyncio/test_asyncio_namespace.py b/tests/asyncio/test_asyncio_namespace.py
@@ -1,13 +1,7 @@
 import asyncio
 import sys
 import unittest
-
-import six
-
-if six.PY3:
-    from unittest import mock
-else:
-    import mock
+from unittest import mock
 
 from socketio import asyncio_namespace
 
diff --git a/tests/asyncio/test_asyncio_pubsub_manager.py b/tests/asyncio/test_asyncio_pubsub_manager.py
@@ -2,17 +2,12 @@
 import functools
 import sys
 import unittest
+from unittest import mock
 
-import six
-
-if six.PY3:
-    from unittest import mock
-else:
-    import mock
+import pytest
 
 from socketio import asyncio_manager
 from socketio import asyncio_pubsub_manager
-import pytest
 
 
 def AsyncMock(*args, **kwargs):
diff --git a/tests/asyncio/test_asyncio_redis_manager.py b/tests/asyncio/test_asyncio_redis_manager.py
@@ -1,9 +1,10 @@
 import sys
 import unittest
 
-from socketio import asyncio_redis_manager
 import pytest
 
+from socketio import asyncio_redis_manager
+
 
 @unittest.skipIf(sys.version_info < (3, 5), 'only for Python 3.5+')
 class TestAsyncRedisManager(unittest.TestCase):
diff --git a/tests/asyncio/test_asyncio_server.py b/tests/asyncio/test_asyncio_server.py
@@ -3,20 +3,15 @@
 import logging
 import sys
 import unittest
+from unittest import mock
 
-import six
-
-if six.PY3:
-    from unittest import mock
-else:
-    import mock
+import pytest
 
 from socketio import asyncio_server
 from socketio import asyncio_namespace
 from socketio import exceptions
 from socketio import namespace
 from socketio import packet
-import pytest
 
 
 def AsyncMock(*args, **kwargs):
@@ -912,7 +907,7 @@ def loads(*args, **kwargs):
 
         pkt = packet.Packet(
             packet_type=packet.EVENT,
-            data={six.text_type('foo'): six.text_type('bar')},
+            data={'foo': 'bar'},
         )
         assert pkt.encode() == '2*** encoded ***'
         pkt2 = packet.Packet(encoded_packet=pkt.encode())
diff --git a/tests/common/test_base_manager.py b/tests/common/test_base_manager.py
diff --git a/tests/common/test_client.py b/tests/common/test_client.py
diff --git a/tests/common/test_middleware.py b/tests/common/test_middleware.py
diff --git a/tests/common/test_namespace.py b/tests/common/test_namespace.py
diff --git a/tests/common/test_packet.py b/tests/common/test_packet.py
diff --git a/tests/common/test_pubsub_manager.py b/tests/common/test_pubsub_manager.py
diff --git a/tests/common/test_server.py b/tests/common/test_server.py
