CHORE

Author: Takuma Iwaki

channels_redis/core.py

@@ -494,8 +494,8 @@ async def group_add(self, group: str, channel: str):
         Adds the channel name to a group.
         """
         # Check the inputs
-        assert self.valid_group_name(group), True
-        assert self.valid_channel_name(channel), True
+        assert self.valid_group_name(group), "Group name not valid"
+        assert self.valid_channel_name(channel), "Channel name not valid"
         # Get a connection to the right shard
         group_key = self._group_key(group)
         connection = self.connection(self.consistent_hash(group))

channels_redis/pubsub.py

@@ -37,7 +37,7 @@ def __init__(
         ] = None,
         serializer_format="msgpack",
         **kwargs,
-    ):
+    ) -> None:
         self._args = args
         self._kwargs = kwargs
         self._layers: typing.Dict[asyncio.AbstractEventLoop, RedisPubSubLoopLayer] = {}

channels_redis/py.typed

@@ -1 +0,0 @@
- 

channels_redis/serializers.py

@@ -43,23 +43,22 @@ def _setup_encryption(
         ],
     ):
         # See if we can do encryption if they asked
-        if not symmetric_encryption_keys:
-            self.crypter = None
-            return
-
-        if isinstance(symmetric_encryption_keys, (str, bytes)):
-            raise ValueError(
-                "symmetric_encryption_keys must be a list of possible keys"
-            )
-        keys = typing.cast(
-            typing.Iterable[typing.Union[str, "Buffer"]], symmetric_encryption_keys
-        )
-        if _MultiFernet is None:
-            raise ValueError(
-                "Cannot run with encryption without 'cryptography' installed."
+        if symmetric_encryption_keys:
+            if isinstance(symmetric_encryption_keys, (str, bytes)):
+                raise ValueError(
+                    "symmetric_encryption_keys must be a list of possible keys"
+                )
+            symmetric_encryption_keys = typing.cast(
+                typing.Iterable[typing.Union[str, "Buffer"]], symmetric_encryption_keys
             )
-        sub_fernets = [self.make_fernet(key) for key in keys]
-        self.crypter = _MultiFernet(sub_fernets)
+            if _MultiFernet is None:
+                raise ValueError(
+                    "Cannot run with encryption without 'cryptography' installed."
+                )
+            sub_fernets = [self.make_fernet(key) for key in symmetric_encryption_keys]
+            self.crypter = _MultiFernet(sub_fernets)
+        else:
+            self.crypter = None
 
     def make_fernet(self, key: typing.Union[str, "Buffer"]) -> "Fernet":
         """
@@ -116,7 +115,7 @@ def deserialize(self, message: bytes):
 
 
 class MissingSerializer(BaseMessageSerializer):
-    exception: "Exception" = Exception(None)
+    exception: typing.Optional[Exception] = None
 
     def __init__(self, *args, **kwargs):
         raise self.exception

tests/test_core.py

@@ -419,6 +419,12 @@ def test_repeated_group_send_with_async_to_sync(channel_layer):
         pytest.fail(f"repeated async_to_sync wrapped group_send calls raised {exc}")
 
 
+@pytest.mark.xfail(
+    reason="""
+Fails with error in redis-py: int() argument must be a string, a bytes-like
+object or a real number, not 'NoneType'. Refs: #348
+"""
+)
 @pytest.mark.asyncio
 async def test_receive_cancel(channel_layer):
     """
@@ -551,6 +557,7 @@ async def test_message_expiry__group_send(channel_layer):
             await channel_layer.receive(channel_name)
 
 
+@pytest.mark.xfail(reason="Fails with timeout. Refs: #348")
 @pytest.mark.asyncio
 async def test_message_expiry__group_send__one_channel_expires_message(channel_layer):
     expiry = 3