Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions kombu/transport/SQS.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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],
}

Expand All @@ -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]
)
Expand Down
6 changes: 4 additions & 2 deletions t/unit/transport/test_SQS.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down