From 6d352dd3a665ce8bafe5a7d97e4da0a33d4dd2ff Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 26 Feb 2024 13:01:38 +0900 Subject: [PATCH] Fix pylint error pylint 3.1.0 introduced the new check (use-yield-from) and this detects a few failures in current code. This fixes these failures. Change-Id: Ia5396895b27e4b28a7d9d8d85a85a8449c21d493 --- octavia/amphorae/backends/agent/api_server/osutils.py | 3 +-- octavia/common/tls_utils/cert_parser.py | 6 ++---- octavia/network/drivers/noop_driver/driver.py | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/octavia/amphorae/backends/agent/api_server/osutils.py b/octavia/amphorae/backends/agent/api_server/osutils.py index 25322164d5..16d34295c7 100644 --- a/octavia/amphorae/backends/agent/api_server/osutils.py +++ b/octavia/amphorae/backends/agent/api_server/osutils.py @@ -38,8 +38,7 @@ class BaseOS(object): @classmethod def _get_subclasses(cls): for subclass in cls.__subclasses__(): - for sc in subclass._get_subclasses(): - yield sc + yield from subclass._get_subclasses() yield subclass @classmethod diff --git a/octavia/common/tls_utils/cert_parser.py b/octavia/common/tls_utils/cert_parser.py index f1e6e8dbe6..62c394ed3c 100644 --- a/octavia/common/tls_utils/cert_parser.py +++ b/octavia/common/tls_utils/cert_parser.py @@ -164,16 +164,14 @@ def _parse_pkcs7_bundle(pkcs7): if PKCS7_BEG in pkcs7: try: for substrate in _read_pem_blocks(pkcs7): - for cert in _get_certs_from_pkcs7_substrate(substrate): - yield cert + yield from _get_certs_from_pkcs7_substrate(substrate) except Exception as e: LOG.exception('Unreadable Certificate.') raise exceptions.UnreadableCert from e # If no PEM encoding, assume this is DER encoded and try to decode else: - for cert in _get_certs_from_pkcs7_substrate(pkcs7): - yield cert + yield from _get_certs_from_pkcs7_substrate(pkcs7) def _read_pem_blocks(data): diff --git a/octavia/network/drivers/noop_driver/driver.py b/octavia/network/drivers/noop_driver/driver.py index 7fcef3dcea..e907d207d7 100644 --- a/octavia/network/drivers/noop_driver/driver.py +++ b/octavia/network/drivers/noop_driver/driver.py @@ -204,8 +204,7 @@ class NoopManager(object): return len(self.known_subnets) + 1 def __iter__(self): - for subnet_id in self.known_subnets: - yield subnet_id + yield from self.known_subnets subnet = network_models.Subnet(id=uuidutils.generate_uuid(), network_id=self.network.id) self.known_subnets[subnet.id] = subnet