Pylint: fix the rest of unused local variables

Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>

8 files changed, 35 insertions, 55 deletions

diff --git a/ipapython/certdb.py b/ipapython/certdb.py
index 850ba59bf..06666c022 100644
--- a/ipapython/certdb.py
+++ b/ipapython/certdb.py
@@ -30,8 +30,6 @@ from ipapython.ipa_log_manager import root_logger
 from ipapython import ipautil
 from ipalib import x509
 
-# pylint: disable=unused-variable
-
 CA_NICKNAME_FMT = "%s IPA CA"
 
 
@@ -359,7 +357,7 @@ class NSSDatabase(object):
 
                     server_certs = self.find_server_certs()
                     if key_nickname:
-                        for nickname, trust_flags in server_certs:
+                        for nickname, _trust_flags in server_certs:
                             if nickname == key_nickname:
                                 break
                         else:
@@ -422,7 +420,7 @@ class NSSDatabase(object):
             try:
                 self.run_certutil(["-M", "-n", root_nickname,
                                    "-t", trust_flags])
-            except ipautil.CalledProcessError as e:
+            except ipautil.CalledProcessError:
                 raise RuntimeError(
                     "Setting trust on %s failed" % root_nickname)
 
@@ -434,7 +432,7 @@ class NSSDatabase(object):
             raise RuntimeError("Failed to get %s" % nickname)
         cert = result.output
         if not pem:
-            (cert, start) = find_cert_from_txt(cert, start=0)
+            cert, _start = find_cert_from_txt(cert, start=0)
             cert = x509.strip_header(cert)
             cert = base64.b64decode(cert)
         return cert
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index 8c3faf029..765f9e887 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -34,8 +34,6 @@ from ipapython.ipa_log_manager import root_logger
 from ipaplatform.paths import paths
 from ipaplatform import services
 
-# pylint: disable=unused-variable
-
 DBUS_CM_PATH = '/org/fedorahosted/certmonger'
 DBUS_CM_IF = 'org.fedorahosted.certmonger'
 DBUS_CM_NAME = 'org.fedorahosted.certmonger'
@@ -88,7 +86,7 @@ class _certmonger(_cm_dbus_object):
         sock_filename = os.path.join(tempfile.mkdtemp(), 'certmonger')
         self._proc = subprocess.Popen([paths.CERTMONGER, '-n', '-L', '-P',
                                        sock_filename])
-        for t in range(0, self.timeout, 5):
+        for _t in range(0, self.timeout, 5):
             if os.path.exists(sock_filename):
                 return "unix:path=%s" % sock_filename
             time.sleep(5)
@@ -101,7 +99,7 @@ class _certmonger(_cm_dbus_object):
             if retcode is not None:
                 return
             self._proc.terminate()
-            for t in range(0, self.timeout, 5):
+            for _t in range(0, self.timeout, 5):
                 retcode = self._proc.poll()
                 if retcode is not None:
                     return
@@ -140,7 +138,7 @@ class _certmonger(_cm_dbus_object):
                     root_logger.error("Failed to start certmonger: %s" % e)
                     raise
 
-                for t in range(0, self.timeout, 5):
+                for _t in range(0, self.timeout, 5):
                     try:
                         self._bus.get_name_owner(DBUS_CM_NAME)
                         break
@@ -535,7 +533,7 @@ def check_state(dirs):
 
 
 def wait_for_request(request_id, timeout=120):
-    for i in range(0, timeout, 5):
+    for _i in range(0, timeout, 5):
         state = get_request_value(request_id, 'status')
         root_logger.debug("certmonger request is in state %r", state)
         if state in ('CA_REJECTED', 'CA_UNREACHABLE', 'CA_UNCONFIGURED',
diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index eaf6a37e7..97f24b2fb 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -27,8 +27,6 @@ from six.moves.urllib.parse import urlparse
 
 from ipapython.ipa_log_manager import log_mgr
 
-# pylint: disable=unused-variable
-
 '''
 Core Python has two cookie libraries, Cookie.py targeted to server
 side and cookielib.py targeted to client side. So why this module and
@@ -542,7 +540,7 @@ class Cookie(object):
         received from.
         '''
 
-        scheme, domain, path, params, query, fragment = urlparse(url)
+        _scheme, domain, path, _params, _query, _fragment = urlparse(url)
 
         if self.domain is None:
             self.domain = domain.lower()
@@ -599,7 +597,7 @@ class Cookie(object):
             from ipalib.util import validate_domain_name
             try:
                 validate_domain_name(url_domain)
-            except Exception as e:
+            except Exception:
                 return False
 
             if cookie_domain is None:
@@ -644,7 +642,10 @@ class Cookie(object):
 
         cookie_name = self.key
 
-        url_scheme, url_domain, url_path, url_params, url_query, url_fragment = urlparse(url)
+        (
+            url_scheme, url_domain, url_path,
+            _url_params, _url_query, _url_fragment
+        ) = urlparse(url)
 
         cookie_expiration = self.get_expiration()
         if cookie_expiration is not None:
diff --git a/ipapython/dnssec/localhsm.py b/ipapython/dnssec/localhsm.py
index 338adda0f..d02fc75d1 100755
--- a/ipapython/dnssec/localhsm.py
+++ b/ipapython/dnssec/localhsm.py
@@ -18,8 +18,6 @@ from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
                                      keytype_id2name, keytype_name2id,
                                      ldap2p11helper_api_params)
 
-# pylint: disable=unused-variable
-
 private_key_api_params = set(["label", "id", "data", "unwrapping_key",
     "wrapping_mech", "key_type", "cka_always_authenticate", "cka_copyable",
     "cka_decrypt", "cka_derive", "cka_extractable", "cka_modifiable",
@@ -81,7 +79,7 @@ class Key(collections.MutableMapping):
 
     def __len__(self):
         cnt = 0
-        for attr in self:
+        for _attr in self:
             cnt += 1
         return cnt
 
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 2dfc5b350..c6f0aaa2e 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -44,8 +44,6 @@ from ipapython.dn import DN
 from ipapython.dnsutil import DNSName
 from ipapython.kerberos import Principal
 
-# pylint: disable=unused-variable
-
 if six.PY3:
     unicode = str
 
@@ -890,7 +888,7 @@ class LDAPClient(object):
                     return DNSName.from_text(val)
                 else:
                     return target_type(val)
-            except Exception as e:
+            except Exception:
                 msg = 'unable to convert the attribute %r value %r to type %s' % (attr, val, target_type)
                 self.log.error(msg)
                 raise ValueError(msg)
@@ -1206,10 +1204,6 @@ class LDAPClient(object):
             False - forbid trailing filter wildcard when exact=False
         """
         if isinstance(value, (list, tuple)):
-            if rules == cls.MATCH_NONE:
-                make_filter_rules = cls.MATCH_ANY
-            else:
-                make_filter_rules = rules
             flts = [
                 cls.make_filter_from_attr(
                     attr, v, exact=exact,
@@ -1384,7 +1378,7 @@ class LDAPClient(object):
                     )
                     while True:
                         result = self.conn.result3(id, 0)
-                        objtype, res_list, res_id, res_ctrls = result
+                        objtype, res_list, _res_id, res_ctrls = result
                         res_list = self._convert_result(res_list)
                         if not res_list:
                             break
@@ -1682,7 +1676,7 @@ class IPAdmin(LDAPClient):
                 pw_name = pwd.getpwuid(os.geteuid()).pw_name
                 self.do_external_bind(pw_name, timeout=timeout)
                 return
-            except errors.NotFound as e:
+            except errors.NotFound:
                 if autobind == AUTOBIND_ENABLED:
                     # autobind was required and failed, raise
                     # exception that it failed
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 41544a114..b0aa26285 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -54,8 +54,6 @@ from ipapython import config
 from ipaplatform.paths import paths
 from ipapython.dn import DN
 
-# pylint: disable=unused-variable
-
 SHARE_DIR = paths.USR_SHARE_IPA_DIR
 PLUGINS_SHARE_DIR = paths.IPA_PLUGINS
 
@@ -115,7 +113,7 @@ class UnsafeIPAddress(netaddr.IPAddress):
                 # netaddr.IPAddress doesn't handle zone indices in textual
                 # IPv6 addresses. Try removing zone index and parse the
                 # address again.
-                addr, sep, foo = addr.partition('%')
+                addr, sep, _foo = addr.partition('%')
                 if sep != '%':
                     raise
                 addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags)
@@ -933,7 +931,7 @@ def user_input(prompt, default = None, allow_empty = True):
 
 def host_port_open(host, port, socket_type=socket.SOCK_STREAM, socket_timeout=None):
     for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket_type):
-        af, socktype, proto, canonname, sa = res
+        af, socktype, proto, _canonname, sa = res
         try:
             try:
                 s = socket.socket(af, socktype, proto)
@@ -951,7 +949,7 @@ def host_port_open(host, port, socket_type=socket.SOCK_STREAM, socket_timeout=No
                 s.recv(512)
 
             return True
-        except socket.error as e:
+        except socket.error:
             pass
         finally:
             if s:
@@ -976,7 +974,7 @@ def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=Non
             last_socket_error = e
             continue
         for res in addr_infos:
-            af, socktype, proto, canonname, sa = res
+            af, socktype, proto, _canonname, sa = res
             try:
                 s = socket.socket(af, socktype, proto)
             except socket.error as e:
@@ -1003,14 +1001,14 @@ def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=Non
                 while True:
                     if socket_type == socket.SOCK_STREAM:
                         s.listen(1)
-                        connection, client_address = s.accept()
+                        connection, _client_address = s.accept()
                         try:
                             if responder_data:
                                 connection.sendall(responder_data)
                         finally:
                             connection.close()
                     elif socket_type == socket.SOCK_DGRAM:
-                        data, addr = s.recvfrom(1)
+                        _data, addr = s.recvfrom(1)
 
                         if responder_data:
                             s.sendto(responder_data, addr)
diff --git a/ipapython/p11helper.py b/ipapython/p11helper.py
index 0001b6a34..5963c6d71 100644
--- a/ipapython/p11helper.py
+++ b/ipapython/p11helper.py
@@ -12,8 +12,6 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa
 from cffi import FFI
 
-# pylint: disable=unused-variable
-
 if six.PY3:
     unicode = str
 
@@ -931,7 +929,7 @@ class P11_Helper(object):
             raise DuplicationError("Master key with same ID already exists")
 
         # Process keyword boolean arguments
-        (cka_copyable_ptr, cka_decrypt_ptr, cka_derive_ptr, cka_encrypt_ptr,
+        (_cka_copyable_ptr, cka_decrypt_ptr, cka_derive_ptr, cka_encrypt_ptr,
          cka_extractable_ptr, cka_modifiable_ptr, cka_private_ptr,
          cka_sensitive_ptr, cka_sign_ptr, cka_unwrap_ptr, cka_verify_ptr,
          cka_wrap_ptr, cka_wrap_with_trusted_ptr,) = convert_py2bool(attrs)
@@ -1041,14 +1039,14 @@ class P11_Helper(object):
         modulus_bits_ptr = new_ptr(CK_ULONG, modulus_bits)
 
         # Process keyword boolean arguments
-        (pub_cka_copyable_ptr, pub_cka_derive_ptr, pub_cka_encrypt_ptr,
+        (_pub_cka_copyable_ptr, pub_cka_derive_ptr, pub_cka_encrypt_ptr,
          pub_cka_modifiable_ptr, pub_cka_private_ptr, pub_cka_trusted_ptr,
          pub_cka_verify_ptr, pub_cka_verify_recover_ptr, pub_cka_wrap_ptr,
          ) = convert_py2bool(attrs_pub)
-        (priv_cka_always_authenticate_ptr, priv_cka_copyable_ptr,
+        (priv_cka_always_authenticate_ptr, _priv_cka_copyable_ptr,
          priv_cka_decrypt_ptr, priv_cka_derive_ptr, priv_cka_extractable_ptr,
          priv_cka_modifiable_ptr, priv_cka_private_ptr, priv_cka_sensitive_ptr,
-         priv_cka_sign_ptr, priv_cka_sign_recover_ptr, priv_cka_unwrap_ptr,
+         priv_cka_sign_ptr, _priv_cka_sign_recover_ptr, priv_cka_unwrap_ptr,
          priv_cka_wrap_with_trusted_ptr,) = convert_py2bool(attrs_priv)
 
         # 65537 (RFC 6376 section 3.3.1)
@@ -1486,7 +1484,7 @@ class P11_Helper(object):
             raise DuplicationError("Secret key with same ID already exists")
 
         # Process keyword boolean arguments
-        (cka_copyable_ptr, cka_decrypt_ptr, cka_derive_ptr, cka_encrypt_ptr,
+        (_cka_copyable_ptr, cka_decrypt_ptr, cka_derive_ptr, cka_encrypt_ptr,
          cka_extractable_ptr, cka_modifiable_ptr, cka_private_ptr,
          cka_sensitive_ptr, cka_sign_ptr, cka_unwrap_ptr, cka_verify_ptr,
          cka_wrap_ptr, cka_wrap_with_trusted_ptr,) = convert_py2bool(attrs)
@@ -1572,10 +1570,10 @@ class P11_Helper(object):
             raise DuplicationError("Secret key with same ID already exists")
 
         # Process keyword boolean arguments
-        (cka_always_authenticate_ptr, cka_copyable_ptr, cka_decrypt_ptr,
+        (cka_always_authenticate_ptr, _cka_copyable_ptr, cka_decrypt_ptr,
          cka_derive_ptr, cka_extractable_ptr, cka_modifiable_ptr,
          cka_private_ptr, cka_sensitive_ptr, cka_sign_ptr,
-         cka_sign_recover_ptr, cka_unwrap_ptr, cka_wrap_with_trusted_ptr,
+         _cka_sign_recover_ptr, cka_unwrap_ptr, cka_wrap_with_trusted_ptr,
          ) = convert_py2bool(attrs_priv)
 
         template = new_array(CK_ATTRIBUTE, (
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index 4e3cccb06..2a8f44826 100644
--- a/ipapython/sysrestore.py
+++ b/ipapython/sysrestore.py
@@ -35,8 +35,6 @@ from six.moves.configparser import SafeConfigParser
 from ipaplatform.tasks import tasks
 from ipaplatform.paths import paths
 
-# pylint: disable=unused-variable
-
 if six.PY3:
     unicode = str
 
@@ -118,10 +116,10 @@ class FileStore(object):
             root_logger.debug("  -> Not backing up - '%s' doesn't exist", path)
             return
 
-        (reldir, backupfile) = os.path.split(path)
+        _reldir, backupfile = os.path.split(path)
 
         filename = ""
-        for i in range(8):
+        for _i in range(8):
             h = "%02x" % self.random.randint(0,255)
             filename += h
         filename += "-"+backupfile
@@ -145,8 +143,8 @@ class FileStore(object):
         Returns #True if the file exists in the file store, #False otherwise
         """
         result = False
-        for (key, value) in self.files.items():
-            (mode,uid,gid,filepath) = value.split(',', 3)
+        for _key, value in self.files.items():
+            _mode, _uid, _gid, filepath = value.split(',', 3)
             if (filepath == path):
                 result = True
                 break
@@ -264,13 +262,10 @@ class FileStore(object):
         if not os.path.isabs(path):
             raise ValueError("Absolute path required")
 
-        mode = None
-        uid = None
-        gid = None
         filename = None
 
         for (key, value) in self.files.items():
-            (mode,uid,gid,filepath) = value.split(',', 3)
+            _mode, _uid, _gid, filepath = value.split(',', 3)
             if (filepath == path):
                 filename = key
                 break