From e3eb94c23206603103f3c4faec6c227f59a1544c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2024 06:06:02 +0200 Subject: Merging upstream version 9.5.1+dfsg. Signed-off-by: Daniel Baumann --- ansible_collections/community/rabbitmq/tests/unit/compat/mock.py | 6 ++---- ansible_collections/community/rabbitmq/tests/unit/mock/loader.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'ansible_collections/community/rabbitmq/tests/unit') diff --git a/ansible_collections/community/rabbitmq/tests/unit/compat/mock.py b/ansible_collections/community/rabbitmq/tests/unit/compat/mock.py index 0972cd2e8..c7d018307 100644 --- a/ansible_collections/community/rabbitmq/tests/unit/compat/mock.py +++ b/ansible_collections/community/rabbitmq/tests/unit/compat/mock.py @@ -64,8 +64,7 @@ if sys.version_info >= (3,) and sys.version_info < (3, 4, 4): # newline that our naive format() added data_as_list[-1] = data_as_list[-1][:-1] - for line in data_as_list: - yield line + yield from data_as_list def mock_open(mock=None, read_data=''): """ @@ -93,8 +92,7 @@ if sys.version_info >= (3,) and sys.version_info < (3, 4, 4): if handle.readline.return_value is not None: while True: yield handle.readline.return_value - for line in _data: - yield line + yield from _data global file_spec if file_spec is None: diff --git a/ansible_collections/community/rabbitmq/tests/unit/mock/loader.py b/ansible_collections/community/rabbitmq/tests/unit/mock/loader.py index 00a584127..e25731e03 100644 --- a/ansible_collections/community/rabbitmq/tests/unit/mock/loader.py +++ b/ansible_collections/community/rabbitmq/tests/unit/mock/loader.py @@ -30,7 +30,7 @@ class DictDataLoader(DataLoader): def __init__(self, file_mapping=None): file_mapping = {} if file_mapping is None else file_mapping - assert type(file_mapping) == dict + assert isinstance(file_mapping, dict) super(DictDataLoader, self).__init__() -- cgit v1.2.3