From df3c40fd340304137e14cc4fd3d534a627f95968 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Thu, 29 Jul 2021 18:44:42 +0300 Subject: [PATCH] pylint: Skip raising-bad-type See https://github.com/PyCQA/pylint/issues/4772 for details. Fixes: https://pagure.io/freeipa/issue/9117 Signed-off-by: Stanislav Levin Reviewed-By: Rob Crittenden --- install/tools/ipa-custodia-check.in | 10 +++++----- ipaserver/advise/base.py | 1 + ipaserver/plugins/idviews.py | 1 + ipaserver/plugins/trust.py | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/install/tools/ipa-custodia-check.in b/install/tools/ipa-custodia-check.in index 59d42b6ff..4f526b433 100644 --- a/install/tools/ipa-custodia-check.in +++ b/install/tools/ipa-custodia-check.in @@ -184,7 +184,7 @@ class IPACustodiaTester: pkey = JWK(**dictkeys[usage_id]) local_pubkey = json_decode(pkey.export_public()) except Exception: - raise self.error( + raise self.error( # pylint: disable=raising-bad-type, #4772 "Failed to load and parse local JWK.", fatal=True ) else: @@ -193,7 +193,7 @@ class IPACustodiaTester: )) if pkey.key_id != self.host_spn: - raise self.error( + raise self.error( # pylint: disable=raising-bad-type, #4772 "KID '{}' != host service principal name '{}' " "(usage: {})".format(pkey.key_id, self.host_spn, usage), fatal=True @@ -210,7 +210,7 @@ class IPACustodiaTester: try: host_pubkey = json_decode(find_key(self.host_spn, usage_id)) except Exception: - raise self.error( + raise self.error( # pylint: disable=raising-bad-type, #4772 "Fetching host keys {} (usage: {}) failed.".format( self.host_spn, usage), fatal=True @@ -223,7 +223,7 @@ class IPACustodiaTester: if host_pubkey != local_pubkey: self.debug("LDAP: '{}'".format(host_pubkey)) self.debug("Local: '{}'".format(local_pubkey)) - raise self.error( + raise self.error( # pylint: disable=raising-bad-type, #4772 "Host key in LDAP does not match local key.", fatal=True ) @@ -235,7 +235,7 @@ class IPACustodiaTester: try: server_pubkey = json_decode(find_key(self.server_spn, usage_id)) except Exception: - raise self.error( + raise self.error( # pylint: disable=raising-bad-type, #4772 "Fetching server keys {} (usage: {}) failed.".format( self.server_spn, usage), fatal=True diff --git a/ipaserver/advise/base.py b/ipaserver/advise/base.py index 64baba772..e0b18636e 100644 --- a/ipaserver/advise/base.py +++ b/ipaserver/advise/base.py @@ -458,6 +458,7 @@ class IpaAdvise(admintool.AdminTool): installutils.check_server_configuration() if len(self.args) > 1: + # pylint: disable=raising-bad-type, #4772 raise self.option_parser.error("You can only provide one " "positional argument.") diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py index 7d17c4035..9b33a952f 100644 --- a/ipaserver/plugins/idviews.py +++ b/ipaserver/plugins/idviews.py @@ -178,6 +178,7 @@ class idview(LDAPObject): try: orig_entry_attrs = ldap.get_entry(dn, ['objectclass']) except errors.NotFound: + # pylint: disable=raising-bad-type, #4772 raise self.handle_not_found(*keys) orig_objectclasses = { diff --git a/ipaserver/plugins/trust.py b/ipaserver/plugins/trust.py index 8c9c674f6..c074f6d6e 100644 --- a/ipaserver/plugins/trust.py +++ b/ipaserver/plugins/trust.py @@ -614,6 +614,7 @@ class trust(LDAPObject): ldap.SCOPE_SUBTREE, trustfilter, [''] ) except errors.NotFound: + # pylint: disable=raising-bad-type, #4772 raise self.handle_not_found(keys[-1]) if len(result) > 1: