Small cleanups

Author: stephen-riggs

src/murfey/cli/repost_failed_calls.py

@@ -19,14 +19,14 @@ def dlq_purge(
     transport.load_configuration_file(rabbitmq_credentials)
     transport.connect()
 
-    queue_to_purge = "dlq." + queue
+    queue_to_purge = f"dlq.{queue}"
     idlequeue: Queue = Queue()
     exported_messages = []
 
     def receive_dlq_message(header: dict, message: dict) -> None:
         idlequeue.put_nowait("start")
         header["x-death"][0]["time"] = datetime.timestamp(header["x-death"][0]["time"])
-        filename = dlq_dump_path / (f"{queue}-" + str(header["message-id"]))
+        filename = dlq_dump_path / f"{queue}-{header['message-id']}"
         dlqmsg = {"header": header, "message": message}
         with filename.open("w") as fh:
             json.dump(dlqmsg, fh, indent=2, sort_keys=True)

tests/cli/test_repost_failed_calls.py

@@ -65,10 +65,10 @@ def test_handle_dlq_messages(mock_transport, tmp_path):
             "message": {"content": "msg2"},
         },
     }
-    for message in messages_dict.keys():
-        messages_paths_list.append(tmp_path / message)
-        with open(tmp_path / message, "w") as msg_file:
-            json.dump(messages_dict[message], msg_file)
+    for file_name, message in messages_dict.items():
+        messages_paths_list.append(tmp_path / file_name)
+        with open(tmp_path / file_name, "w") as msg_file:
+            json.dump(message, msg_file)
 
     # Send the two messages, plus a file that is not a message
     repost_failed_calls.handle_dlq_messages(
@@ -124,10 +124,10 @@ def test_handle_failed_posts(mock_requests, tmp_path):
             "header": {"content": "msg3"},  # does not have a message
         },
     }
-    for message in messages_dict.keys():
-        messages_paths_list.append(tmp_path / message)
-        with open(tmp_path / message, "w") as msg_file:
-            json.dump(messages_dict[message], msg_file)
+    for file_name, message in messages_dict.items():
+        messages_paths_list.append(tmp_path / file_name)
+        with open(tmp_path / file_name, "w") as msg_file:
+            json.dump(message, msg_file)
 
     class Response:
         def __init__(self, status_code):