ci: add comprehensions linting and fix all violations

Author: owenpearson

pyproject.toml

@@ -87,8 +87,8 @@ extend-exclude = [
 ]
 
 [tool.ruff.lint]
-# Enable Pyflakes (F), pycodestyle (E, W), pep8-naming (N), isort (I), pyupgrade (UP) and bugbear (B)
-select = ["E", "W", "F", "N", "I", "UP", "B"]
+# Enable Pyflakes (F), pycodestyle (E, W), pep8-naming (N), isort (I), pyupgrade (UP), bugbear (B) and comprehensions (C4)
+select = ["E", "W", "F", "N", "I", "UP", "B", "C4"]
 ignore = [
   "N818",  # exception name should end in 'Error'
 ]

test/ably/rest/restchannelpublish_test.py

@@ -56,7 +56,7 @@ async def test_publish_various_datatypes_text(self):
         assert messages is not None, "Expected non-None messages"
         assert len(messages) == 4, "Expected 4 messages"
 
-        message_contents = dict((m.name, m.data) for m in messages)
+        message_contents = {m.name: m.data for m in messages}
         log.debug(f"message_contents: {str(message_contents)}")
 
         assert message_contents["publish0"] == "This is a string message payload", \
@@ -494,7 +494,7 @@ async def test_message_serialization(self):
         }
         message = Message(**data)
         request_body = channel._Channel__publish_request_body(messages=[message])
-        input_keys = set(case.snake_to_camel(x) for x in data.keys())
+        input_keys = {case.snake_to_camel(x) for x in data.keys()}
         assert input_keys - set(request_body) == set()
 
     # RSL1k1

test/ably/rest/restcrypto_test.py

@@ -74,7 +74,7 @@ async def test_crypto_publish(self):
         assert messages is not None, "Expected non-None messages"
         assert 4 == len(messages), "Expected 4 messages"
 
-        message_contents = dict((m.name, m.data) for m in messages)
+        message_contents = {m.name: m.data for m in messages}
         log.debug(f"message_contents: {str(message_contents)}")
 
         assert "This is a string message payload" == message_contents["publish3"],\
@@ -107,7 +107,7 @@ async def test_crypto_publish_256(self):
         assert messages is not None, "Expected non-None messages"
         assert 4 == len(messages), "Expected 4 messages"
 
-        message_contents = dict((m.name, m.data) for m in messages)
+        message_contents = {m.name: m.data for m in messages}
         log.debug(f"message_contents: {str(message_contents)}")
 
         assert "This is a string message payload" == message_contents["publish3"],\
@@ -156,7 +156,7 @@ async def test_crypto_send_unencrypted(self):
         assert messages is not None, "Expected non-None messages"
         assert 4 == len(messages), "Expected 4 messages"
 
-        message_contents = dict((m.name, m.data) for m in messages)
+        message_contents = {m.name: m.data for m in messages}
         log.debug(f"message_contents: {str(message_contents)}")
 
         assert "This is a string message payload" == message_contents["publish3"],\