pylint: update for use-yield-from

* With Pylint 3.1.0, use-yield-from check is enabled

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
pull/82879/head
Abhijeet Kasurde 2 months ago committed by Matt Clay
parent 481d8bdc1e
commit aecffcb896

@ -365,12 +365,10 @@ def _return_datastructure_name(obj):
return return
elif isinstance(obj, Mapping): elif isinstance(obj, Mapping):
for element in obj.items(): for element in obj.items():
for subelement in _return_datastructure_name(element[1]): yield from _return_datastructure_name(element[1])
yield subelement
elif is_iterable(obj): elif is_iterable(obj):
for element in obj: for element in obj:
for subelement in _return_datastructure_name(element): yield from _return_datastructure_name(element)
yield subelement
elif obj is None or isinstance(obj, bool): elif obj is None or isinstance(obj, bool):
# This must come before int because bools are also ints # This must come before int because bools are also ints
return return

@ -425,8 +425,7 @@ def get_unneeded_pkgs(base):
query = libdnf5.rpm.PackageQuery(base) query = libdnf5.rpm.PackageQuery(base)
query.filter_installed() query.filter_installed()
query.filter_unneeded() query.filter_unneeded()
for pkg in query: yield from query
yield pkg
class Dnf5Module(YumDnf): class Dnf5Module(YumDnf):

@ -108,8 +108,7 @@ class HostVars(Mapping):
return self._find_host(host_name) is not None return self._find_host(host_name) is not None
def __iter__(self): def __iter__(self):
for host in self._inventory.hosts: yield from self._inventory.hosts
yield host
def __len__(self): def __len__(self):
return len(self._inventory.hosts) return len(self._inventory.hosts)
@ -141,8 +140,7 @@ class HostVarsVars(Mapping):
return (var in self._vars) return (var in self._vars)
def __iter__(self): def __iter__(self):
for var in self._vars.keys(): yield from self._vars.keys()
yield var
def __len__(self): def __len__(self):
return len(self._vars.keys()) return len(self._vars.keys())

@ -55,8 +55,7 @@ def find_deprecations(obj, path=None):
this_path.append(key) this_path.append(key)
if key != 'deprecated': if key != 'deprecated':
for result in find_deprecations(value, path=this_path): yield from find_deprecations(value, path=this_path)
yield result
else: else:
try: try:
version = value['version'] version = value['version']

@ -92,13 +92,11 @@ class TestIncludeRole(unittest.TestCase):
if isinstance(task, IncludeRole): if isinstance(task, IncludeRole):
blocks, handlers = task.get_block_list(loader=self.loader) blocks, handlers = task.get_block_list(loader=self.loader)
for block in blocks: for block in blocks:
for t in self.flatten_tasks(block.block): yield from self.flatten_tasks(block.block)
yield t
elif isinstance(task, Task): elif isinstance(task, Task):
yield task yield task
else: else:
for t in self.flatten_tasks(task.block): yield from self.flatten_tasks(task.block)
yield t
def get_tasks_vars(self, play, tasks): def get_tasks_vars(self, play, tasks):
for task in self.flatten_tasks(tasks): for task in self.flatten_tasks(tasks):

Loading…
Cancel
Save