diff --git a/lib/ansible/module_utils/common/parameters.py b/lib/ansible/module_utils/common/parameters.py index 3b8c1c37a4e..b9f5be43a70 100644 --- a/lib/ansible/module_utils/common/parameters.py +++ b/lib/ansible/module_utils/common/parameters.py @@ -365,12 +365,10 @@ def _return_datastructure_name(obj): return elif isinstance(obj, Mapping): for element in obj.items(): - for subelement in _return_datastructure_name(element[1]): - yield subelement + yield from _return_datastructure_name(element[1]) elif is_iterable(obj): for element in obj: - for subelement in _return_datastructure_name(element): - yield subelement + yield from _return_datastructure_name(element) elif obj is None or isinstance(obj, bool): # This must come before int because bools are also ints return diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py index 8d122aef7cf..2fa09b2b8df 100644 --- a/lib/ansible/modules/dnf5.py +++ b/lib/ansible/modules/dnf5.py @@ -425,8 +425,7 @@ def get_unneeded_pkgs(base): query = libdnf5.rpm.PackageQuery(base) query.filter_installed() query.filter_unneeded() - for pkg in query: - yield pkg + yield from query class Dnf5Module(YumDnf): diff --git a/lib/ansible/vars/hostvars.py b/lib/ansible/vars/hostvars.py index 21328dfeed0..424e6ef70c9 100644 --- a/lib/ansible/vars/hostvars.py +++ b/lib/ansible/vars/hostvars.py @@ -108,8 +108,7 @@ class HostVars(Mapping): return self._find_host(host_name) is not None def __iter__(self): - for host in self._inventory.hosts: - yield host + yield from self._inventory.hosts def __len__(self): return len(self._inventory.hosts) @@ -141,8 +140,7 @@ class HostVarsVars(Mapping): return (var in self._vars) def __iter__(self): - for var in self._vars.keys(): - yield var + yield from self._vars.keys() def __len__(self): return len(self._vars.keys()) diff --git a/test/sanity/code-smell/deprecated-config.py b/test/sanity/code-smell/deprecated-config.py index 474628a35cb..7056ca2746f 100644 --- a/test/sanity/code-smell/deprecated-config.py +++ b/test/sanity/code-smell/deprecated-config.py @@ -55,8 +55,7 @@ def find_deprecations(obj, path=None): this_path.append(key) if key != 'deprecated': - for result in find_deprecations(value, path=this_path): - yield result + yield from find_deprecations(value, path=this_path) else: try: version = value['version'] diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py index 34bf0a538fc..97ce325edcb 100644 --- a/test/units/playbook/role/test_include_role.py +++ b/test/units/playbook/role/test_include_role.py @@ -92,13 +92,11 @@ class TestIncludeRole(unittest.TestCase): if isinstance(task, IncludeRole): blocks, handlers = task.get_block_list(loader=self.loader) for block in blocks: - for t in self.flatten_tasks(block.block): - yield t + yield from self.flatten_tasks(block.block) elif isinstance(task, Task): yield task else: - for t in self.flatten_tasks(task.block): - yield t + yield from self.flatten_tasks(task.block) def get_tasks_vars(self, play, tasks): for task in self.flatten_tasks(tasks):