summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-02-25 13:46:33 +0100
committerTomas Babej <tbabej@redhat.com>2016-03-02 14:57:36 +0100
commit72d5499c5a902c860c5496ee6e604526672e5777 (patch)
tree254cab47fdfe006362f3b67b492c6ade8d546b26
parentc68e9510d03abb75d353e209ea32ac9d1ed362bc (diff)
downloadfreeipa-72d5499c5a902c860c5496ee6e604526672e5777.tar.gz
freeipa-72d5499c5a902c860c5496ee6e604526672e5777.tar.xz
freeipa-72d5499c5a902c860c5496ee6e604526672e5777.zip
pylint: supress false positive no-member errors
pylint 1.5 prints many false positive no-member errors which are supressed by this commit. https://fedorahosted.org/freeipa/ticket/5615 Reviewed-By: David Kupka <dkupka@redhat.com>
-rwxr-xr-xinstall/tools/ipactl4
-rw-r--r--ipalib/krb_utils.py2
-rw-r--r--ipalib/plugins/batch.py9
-rw-r--r--ipalib/plugins/server.py5
-rw-r--r--ipapython/ipaldap.py2
-rw-r--r--ipapython/ipautil.py2
-rw-r--r--ipapython/nsslib.py7
-rw-r--r--ipaserver/install/installutils.py9
-rw-r--r--ipaserver/install/ipa_otptoken_import.py5
-rw-r--r--ipaserver/install/server/install.py3
-rw-r--r--ipaserver/install/service.py3
-rw-r--r--ipatests/test_xmlrpc/xmlrpc_test.py2
12 files changed, 36 insertions, 17 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl
index ff5ea5a50..d27ada565 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -290,7 +290,7 @@ def ipa_start(options):
if isinstance(e, IpactlError):
# do not display any other error message
- raise IpactlError(rval=e.rval)
+ raise IpactlError(rval=e.rval) # pylint: disable=no-member
else:
raise IpactlError()
@@ -387,7 +387,7 @@ def ipa_restart(options):
pass
if isinstance(e, IpactlError):
# do not display any other error message
- raise IpactlError(rval=e.rval)
+ raise IpactlError(rval=e.rval) # pylint: disable=no-member
else:
raise IpactlError()
diff --git a/ipalib/krb_utils.py b/ipalib/krb_utils.py
index b33e4b7c8..e6e277c7a 100644
--- a/ipalib/krb_utils.py
+++ b/ipalib/krb_utils.py
@@ -160,7 +160,7 @@ def get_credentials(name=None, ccache_name=None):
try:
return gssapi.Credentials(usage='initiate', name=name, store=store)
except gssapi.exceptions.GSSError as e:
- if e.min_code == KRB5_FCC_NOFILE:
+ if e.min_code == KRB5_FCC_NOFILE: # pylint: disable=no-member
raise ValueError('"%s", ccache="%s"' % (e.message, ccache_name))
raise
diff --git a/ipalib/plugins/batch.py b/ipalib/plugins/batch.py
index 626ba2835..2da7b7ca8 100644
--- a/ipalib/plugins/batch.py
+++ b/ipalib/plugins/batch.py
@@ -114,11 +114,16 @@ class batch(Command):
if isinstance(e, errors.RequirementError) or \
isinstance(e, errors.CommandError):
self.info(
- '%s: batch: %s', context.principal, e.__class__.__name__
+ '%s: batch: %s',
+ context.principal, # pylint: disable=no-member
+ e.__class__.__name__
)
else:
self.info(
- '%s: batch: %s(%s): %s', context.principal, name, ', '.join(api.Command[name]._repr_iter(**params)), e.__class__.__name__
+ '%s: batch: %s(%s): %s',
+ context.principal, name, # pylint: disable=no-member
+ ', '.join(api.Command[name]._repr_iter(**params)),
+ e.__class__.__name__
)
if isinstance(e, errors.PublicError):
reported_error = e
diff --git a/ipalib/plugins/server.py b/ipalib/plugins/server.py
index e31def77c..93ced8b73 100644
--- a/ipalib/plugins/server.py
+++ b/ipalib/plugins/server.py
@@ -228,8 +228,9 @@ class server_conncheck(crud.PKQuery):
privilege = u'Replication Administrators'
privilege_dn = self.api.Object.privilege.get_dn(privilege)
ldap = self.obj.backend
- filter = ldap.make_filter(
- {'krbprincipalname': context.principal, 'memberof': privilege_dn},
+ filter = ldap.make_filter({
+ 'krbprincipalname': context.principal, # pylint: disable=no-member
+ 'memberof': privilege_dn},
rules=ldap.MATCH_ALL)
try:
ldap.find_entries(base_dn=self.api.env.basedn, filter=filter)
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 7522c504b..2965ba4a5 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -208,7 +208,7 @@ class LDAPEntry(collections.MutableMapping):
Keyword arguments can be used to override values of specific attributes.
"""
- super(LDAPEntry, self).__init__()
+ super(LDAPEntry, self).__init__() # pylint: disable=no-member
if isinstance(_conn, LDAPEntry):
assert _dn is None
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 6d07e07a0..336693c3f 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -1441,7 +1441,7 @@ def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
% (attempt, attempts))
return cred
except gssapi.exceptions.GSSError as e:
- if e.min_code not in errors_to_retry:
+ if e.min_code not in errors_to_retry: # pylint: disable=no-member
raise
root_logger.debug("Attempt %d/%d: failed: %s"
% (attempt, attempts, e))
diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py
index ff4c02328..16aa1d9a4 100644
--- a/ipapython/nsslib.py
+++ b/ipapython/nsslib.py
@@ -63,7 +63,9 @@ def auth_certificate_callback(sock, check_sig, is_server, certdb):
# and the strerror attribute will contain a string describing the reason.
approved_usage = cert.verify_now(certdb, check_sig, intended_usage, *pin_args)
except Exception as e:
- root_logger.error('cert validation failed for "%s" (%s)', cert.subject, e.strerror)
+ root_logger.error(
+ 'cert validation failed for "%s" (%s)', cert.subject,
+ e.strerror) # pylint: disable=no-member
cert_is_valid = False
return cert_is_valid
@@ -93,7 +95,8 @@ def auth_certificate_callback(sock, check_sig, is_server, certdb):
cert_is_valid = cert.verify_hostname(hostname)
except Exception as e:
root_logger.error('failed verifying socket hostname "%s" matches cert subject "%s" (%s)',
- hostname, cert.subject, e.strerror)
+ hostname, cert.subject,
+ e.strerror) # pylint: disable=no-member
cert_is_valid = False
return cert_is_valid
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 4489cd80b..071242654 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -166,7 +166,9 @@ def verify_fqdn(host_name, no_host_dns=False, local_hostname=True):
except socket.gaierror:
pass
except socket.error as e:
- root_logger.debug('socket.gethostbyaddr() error: %d: %s' % (e.errno, e.strerror))
+ root_logger.debug(
+ 'socket.gethostbyaddr() error: %d: %s',
+ e.errno, e.strerror) # pylint: disable=no-member
if no_host_dns:
print("Warning: skipping DNS resolution of host", host_name)
@@ -733,7 +735,10 @@ def run_script(main_function, operation_name, log_file_name=None,
try:
return_value = main_function()
except BaseException as e:
- if isinstance(e, SystemExit) and (e.code is None or e.code == 0):
+ if (
+ isinstance(e, SystemExit) and
+ (e.code is None or e.code == 0) # pylint: disable=no-member
+ ):
# Not an error after all
root_logger.info('The %s command was successful',
operation_name)
diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py
index e68abc889..9e77ed330 100644
--- a/ipaserver/install/ipa_otptoken_import.py
+++ b/ipaserver/install/ipa_otptoken_import.py
@@ -500,11 +500,12 @@ class OTPTokenImport(admintool.AdminTool):
# Verify a key is provided if one is needed.
if self.doc.keyname is not None:
- if self.safe_options.keyfile is None:
+ if self.safe_options.keyfile is None: # pylint: disable=no-member
raise admintool.ScriptError("Encryption key required: %s!" % self.doc.keyname)
# Load the keyfile.
- with open(self.safe_options.keyfile) as f:
+ keyfile = self.safe_options.keyfile # pylint: disable=no-member
+ with open(keyfile) as f:
self.doc.setKey(f.read())
def run(self):
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index 362b99f32..0ab5b268d 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -332,7 +332,8 @@ def check_master_deleted(api, masters, interactive):
try:
ipautil.kinit_keytab(host_princ, paths.KRB5_KEYTAB, ccache_path)
except gssapi.exceptions.GSSError as e:
- if e.min_code == KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
+ min_code = e.min_code # pylint: disable=no-member
+ if min_code == KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
root_logger.debug("Host principal not found, assuming that "
"master is removed from topology")
return True
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index c77a4cc46..636c3cdd1 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -446,7 +446,8 @@ class Service(object):
run_step(full_msg, method)
step += 1
except BaseException as e:
- if not (isinstance(e, SystemExit) and e.code == 0):
+ if not (isinstance(e, SystemExit) and
+ e.code == 0): # pylint: disable=no-member
# show the traceback, so it's not lost if cleanup method fails
root_logger.debug("%s" % traceback.format_exc())
self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py
index 687958d69..330889341 100644
--- a/ipatests/test_xmlrpc/xmlrpc_test.py
+++ b/ipatests/test_xmlrpc/xmlrpc_test.py
@@ -344,7 +344,9 @@ class Declarative(XMLRPC_test):
# client side. However, if we switch to using JSON-RPC for the default
# transport, the exception is a free-form data structure (dict).
# For now just compare the strings
+ # pylint: disable=no-member
assert_deepequal(expected.strerror, e.strerror)
+ # pylint: enable=no-member
def check_callable(self, nice, cmd, args, options, expected):
name = expected.__class__.__name__