Merge branch 'main' into resolve-conflict

Author: Nusnus

kombu/asynchronous/hub.py

@@ -274,6 +274,10 @@ def close(self, *args):
         for item in todos:
             item()
 
+        # Clear global event loop variable if this hub is the current loop
+        if _current_loop is self:
+            set_event_loop(None)
+
     def _discard(self, fd):
         fd = fileno(fd)
         self.readers.pop(fd, None)

kombu/transport/SQS.py

@@ -545,9 +545,10 @@ def _receive_message(
         client = self.sqs(queue=queue)
 
         message_system_attribute_names = self.get_message_attributes.get(
-            'MessageSystemAttributeNames')
+            'MessageSystemAttributeNames') or []
+
         message_attribute_names = self.get_message_attributes.get(
-            'MessageAttributeNames')
+            'MessageAttributeNames') or []
 
         params: dict[str, Any] = {
             'QueueUrl': q_url,
@@ -964,7 +965,7 @@ def get_message_attributes(self) -> dict[str, Any]:
 
         if fetch is None or isinstance(fetch, str):
             return {
-                'MessageAttributeNames': None,
+                'MessageAttributeNames': [],
                 'MessageSystemAttributeNames': [APPROXIMATE_RECEIVE_COUNT],
             }
 
@@ -988,7 +989,7 @@ def get_message_attributes(self) -> dict[str, Any]:
                 )
 
         return {
-            'MessageAttributeNames': sorted(message_attrs) if message_attrs else None,
+            'MessageAttributeNames': sorted(message_attrs) if message_attrs else [],
             'MessageSystemAttributeNames': (
                 sorted(message_system_attrs) if message_system_attrs else [APPROXIMATE_RECEIVE_COUNT]
             )

t/unit/asynchronous/test_hub.py

@@ -586,3 +586,30 @@ def test__pop_ready_uses_lock(self):
         with patch.object(self.hub, '_ready_lock', autospec=True) as lock:
             self.hub._pop_ready()
             lock.__enter__.assert_called_once()
+
+    def test_close_clears_global_event_loop(self):
+        # Test that closing a hub clears the global event loop if it's the current one
+        prev_loop = get_event_loop()
+        try:
+            hub = Hub()
+            set_event_loop(hub)
+            assert get_event_loop() is hub
+            hub.close()
+            assert get_event_loop() is None
+        finally:
+            set_event_loop(prev_loop)
+
+    def test_close_does_not_clear_other_event_loop(self):
+        # Test that closing a hub doesn't clear the global event loop if it's a different one
+        prev_loop = get_event_loop()
+        try:
+            hub1 = Hub()
+            hub2 = Hub()
+            set_event_loop(hub1)
+            assert get_event_loop() is hub1
+            hub2.close()
+            # hub1 should still be the current loop
+            assert get_event_loop() is hub1
+            hub1.close()
+        finally:
+            set_event_loop(prev_loop)

t/unit/transport/test_SQS.py

@@ -125,9 +125,11 @@ def receive_message(
         QueueUrl=None,
         MaxNumberOfMessages=1,
         WaitTimeSeconds=10,
-        MessageAttributeNames=None,
-        MessageSystemAttributeNames=None
+        MessageAttributeNames=[],
+        MessageSystemAttributeNames=[],
     ):
+        assert isinstance(MessageAttributeNames, (list, tuple))
+        assert isinstance(MessageSystemAttributeNames, (list, tuple))
         self._receive_messages_calls += 1
         for q in self._queues.values():
             if q.url == QueueUrl: