From cf28308a9f6fef0b09fd1f5993395964603df457 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sat, 30 Oct 2021 19:39:17 +0200 Subject: [PATCH] Simplify yield syntax --- lib/logitech_receiver/base.py | 6 ++---- lib/logitech_receiver/common.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/logitech_receiver/base.py b/lib/logitech_receiver/base.py index 2065d6e3..7c0c25dd 100644 --- a/lib/logitech_receiver/base.py +++ b/lib/logitech_receiver/base.py @@ -115,8 +115,7 @@ def filter_receivers(bus_id, vendor_id, product_id): def receivers(): """Enumerate all the receivers attached to the machine.""" - for dev in _hid.enumerate(filter_receivers): - yield dev + yield from _hid.enumerate(filter_receivers) def filter_devices(bus_id, vendor_id, product_id): @@ -129,8 +128,7 @@ def filter_devices(bus_id, vendor_id, product_id): def wired_devices(): """Enumerate all the USB-connected and Bluetooth devices attached to the machine.""" - for dev in _hid.enumerate(filter_devices): - yield dev + yield from _hid.enumerate(filter_devices) def filter_either(bus_id, vendor_id, product_id): diff --git a/lib/logitech_receiver/common.py b/lib/logitech_receiver/common.py index 8ef00271..4c5b5996 100644 --- a/lib/logitech_receiver/common.py +++ b/lib/logitech_receiver/common.py @@ -204,8 +204,7 @@ class NamedInts: return value in self.__dict__ or value in self._values def __iter__(self): - for v in self._values: - yield v + yield from self._values def __len__(self): return len(self._values)