summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xclient/ipa-client-automount1
-rwxr-xr-xclient/ipa-client-install2
-rwxr-xr-xdaemons/dnssec/ipa-ods-exporter2
-rwxr-xr-xinstall/certmonger/dogtag-ipa-ca-renew-agent-submit2
-rwxr-xr-xinstall/tools/ipa-adtrust-install2
-rwxr-xr-xinstall/tools/ipa-replica-manage2
-rwxr-xr-xinstall/tools/ipactl2
-rw-r--r--ipaclient/ipachangeconf.py2
-rw-r--r--ipaclient/ipadiscovery.py2
-rw-r--r--ipaclient/plugins/cert.py2
-rw-r--r--ipalib/certstore.py1
-rw-r--r--ipalib/frontend.py2
-rw-r--r--ipalib/parameters.py1
-rw-r--r--ipalib/rpc.py2
-rw-r--r--ipalib/util.py2
-rw-r--r--ipapython/certdb.py2
-rw-r--r--ipapython/certmonger.py2
-rw-r--r--ipapython/cookie.py2
-rwxr-xr-xipapython/dnssec/localhsm.py2
-rw-r--r--ipapython/install/core.py2
-rw-r--r--ipapython/ipaldap.py2
-rw-r--r--ipapython/ipautil.py2
-rw-r--r--ipapython/p11helper.py2
-rw-r--r--ipapython/sysrestore.py2
-rw-r--r--ipaserver/dcerpc.py2
-rw-r--r--ipaserver/install/bindinstance.py2
-rw-r--r--ipaserver/install/ca.py2
-rw-r--r--ipaserver/install/cainstance.py1
-rw-r--r--ipaserver/install/certs.py2
-rw-r--r--ipaserver/install/dns.py2
-rw-r--r--ipaserver/install/dnskeysyncinstance.py2
-rw-r--r--ipaserver/install/dogtaginstance.py2
-rw-r--r--ipaserver/install/dsinstance.py2
-rw-r--r--ipaserver/install/ipa_backup.py2
-rw-r--r--ipaserver/install/ipa_cacert_manage.py2
-rw-r--r--ipaserver/install/ipa_replica_prepare.py1
-rw-r--r--ipaserver/install/ipa_restore.py1
-rw-r--r--ipaserver/install/ipa_winsync_migrate.py2
-rw-r--r--ipaserver/install/opendnssecinstance.py2
-rw-r--r--ipaserver/install/plugins/rename_managed.py2
-rw-r--r--ipaserver/install/replication.py2
-rw-r--r--ipaserver/install/server/install.py2
-rw-r--r--ipaserver/install/server/replicainstall.py2
-rw-r--r--ipaserver/install/server/upgrade.py2
-rw-r--r--ipaserver/install/upgradeinstance.py2
-rw-r--r--ipaserver/plugins/aci.py2
-rw-r--r--ipaserver/plugins/baseldap.py2
-rw-r--r--ipaserver/plugins/cert.py2
-rw-r--r--ipaserver/plugins/dns.py2
-rw-r--r--ipaserver/plugins/dogtag.py2
-rw-r--r--ipaserver/plugins/idrange.py2
-rw-r--r--ipaserver/plugins/idviews.py2
-rw-r--r--ipaserver/plugins/migration.py2
-rw-r--r--ipaserver/plugins/permission.py2
-rw-r--r--ipaserver/plugins/stageuser.py2
-rw-r--r--ipaserver/plugins/trust.py2
-rw-r--r--ipaserver/plugins/user.py2
-rw-r--r--ipaserver/rpcserver.py2
-rw-r--r--ipatests/pytest_plugins/integration.py1
-rw-r--r--ipatests/test_install/test_updates.py2
-rw-r--r--ipatests/test_integration/tasks.py2
-rw-r--r--ipatests/test_ipalib/test_frontend.py2
-rw-r--r--ipatests/test_ipalib/test_parameters.py2
-rw-r--r--ipatests/test_ipalib/test_rpc.py2
-rw-r--r--ipatests/test_ipaserver/test_rpcserver.py2
-rw-r--r--ipatests/test_ipaserver/test_serverroles.py1
-rw-r--r--ipatests/test_xmlrpc/test_sudorule_plugin.py2
-rw-r--r--pylintrc5
68 files changed, 130 insertions, 1 deletions
diff --git a/client/ipa-client-automount b/client/ipa-client-automount
index b444d3ea5..91bdc88f4 100755
--- a/client/ipa-client-automount
+++ b/client/ipa-client-automount
@@ -45,6 +45,7 @@ from ipaplatform.tasks import tasks
from ipaplatform import services
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
def parse_options():
usage = "%prog [options]\n"
diff --git a/client/ipa-client-install b/client/ipa-client-install
index 3614af871..d38eaf951 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -72,6 +72,8 @@ error was:
""" % e, file=sys.stderr)
sys.exit(1)
+# pylint: disable=unused-variable
+
SUCCESS = 0
CLIENT_INSTALL_ERROR = 1
CLIENT_NOT_CONFIGURED = 2
diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter
index 385764a6d..bb208d233 100755
--- a/daemons/dnssec/ipa-ods-exporter
+++ b/daemons/dnssec/ipa-ods-exporter
@@ -41,6 +41,8 @@ from ipapython.dnssec.abshsm import sync_pkcs11_metadata, wrappingmech_name2id
from ipapython.dnssec.ldapkeydb import LdapKeyDB
from ipapython.dnssec.localhsm import LocalHSM
+# pylint: disable=unused-variable
+
DAEMONNAME = 'ipa-ods-exporter'
PRINCIPAL = None # not initialized yet
WORKDIR = os.path.join(paths.VAR_OPENDNSSEC_DIR ,'tmp')
diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
index 7ab3ec15d..329daa0fe 100755
--- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit
+++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
@@ -44,6 +44,8 @@ from ipaplatform.paths import paths
from ipaserver.plugins.ldap2 import ldap2
from ipaserver.install import cainstance, certs
+# pylint: disable=unused-variable
+
# This is a certmonger CA helper script for IPA CA subsystem cert renewal. See
# https://git.fedorahosted.org/cgit/certmonger.git/tree/doc/submit.txt for more
# info on certmonger CA helper scripts.
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index d738cc6ca..13c62aa0b 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -45,6 +45,8 @@ from ipaplatform.paths import paths
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 7641727c5..6152898d1 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -45,6 +45,8 @@ from ipaclient import ipadiscovery
from six.moves.xmlrpc_client import MAXINT
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
# dict of command name and tuples of min/max num of args needed
commands = {
"list":(0, 1, "[master fqdn]", ""),
diff --git a/install/tools/ipactl b/install/tools/ipactl
index e6a1b5a22..d22973838 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -39,6 +39,8 @@ from ipapython.dn import DN
from ipaplatform import services
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
MSG_HINT_IGNORE_SERVICE_FAILURE = (
"Hint: You can use --ignore-service-failure option for forced start in "
diff --git a/ipaclient/ipachangeconf.py b/ipaclient/ipachangeconf.py
index 64177f8fa..b6cbc9bba 100644
--- a/ipaclient/ipachangeconf.py
+++ b/ipaclient/ipachangeconf.py
@@ -24,6 +24,8 @@ import shutil
import six
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaclient/ipadiscovery.py b/ipaclient/ipadiscovery.py
index 62c8aef95..e051bc722 100644
--- a/ipaclient/ipadiscovery.py
+++ b/ipaclient/ipadiscovery.py
@@ -30,6 +30,8 @@ from ipaplatform.paths import paths
from ipapython.ipautil import valid_ip, realm_to_suffix
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
NOT_FQDN = -1
NO_LDAP_SERVER = -2
REALM_NOT_FOUND = -3
diff --git a/ipaclient/plugins/cert.py b/ipaclient/plugins/cert.py
index 1075972c4..5e791ce6e 100644
--- a/ipaclient/plugins/cert.py
+++ b/ipaclient/plugins/cert.py
@@ -27,6 +27,8 @@ from ipalib.parameters import File, Flag, Str
from ipalib.plugable import Registry
from ipalib.text import _
+# pylint: disable=unused-variable
+
register = Registry()
diff --git a/ipalib/certstore.py b/ipalib/certstore.py
index 533a77f91..d71cbd9f5 100644
--- a/ipalib/certstore.py
+++ b/ipalib/certstore.py
@@ -29,6 +29,7 @@ from ipapython.dn import DN
from ipapython.certdb import get_ca_nickname
from ipalib import errors, x509
+# pylint: disable=unused-variable
def _parse_cert(dercert):
try:
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 554d899d9..ca06f6f74 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -40,6 +40,8 @@ from ipalib import errors, messages
from ipalib.request import context, context_frame
from ipalib.util import classproperty, json_serialize
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index 6a289ac52..77a6136cf 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -119,6 +119,7 @@ from ipapython import kerberos
from ipapython.dn import DN
from ipapython.dnsutil import DNSName
+# pylint: disable=unused-variable
def _is_null(value):
return not value and value != 0 # NOTE: False == 0
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 1c002895e..4fb560baf 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -70,6 +70,8 @@ from ipapython.kerberos import Principal
from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
from ipalib import api
+# pylint: disable=unused-variable
+
# The XMLRPC client is in "six.moves.xmlrpc_client", but pylint
# cannot handle that
try:
diff --git a/ipalib/util.py b/ipalib/util.py
index 785dd5fd4..4df6847ed 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -51,6 +51,8 @@ from ipapython.dnsutil import DNSName
from ipapython.dnsutil import resolve_ip_addresses
from ipapython.ipa_log_manager import root_logger
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipapython/certdb.py b/ipapython/certdb.py
index e19f712d8..850ba59bf 100644
--- a/ipapython/certdb.py
+++ b/ipapython/certdb.py
@@ -30,6 +30,8 @@ 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"
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index 1f22fee3d..8c3faf029 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -34,6 +34,8 @@ 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'
diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index 89c3e3cd6..eaf6a37e7 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -27,6 +27,8 @@ 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
diff --git a/ipapython/dnssec/localhsm.py b/ipapython/dnssec/localhsm.py
index 8f18a45be..338adda0f 100755
--- a/ipapython/dnssec/localhsm.py
+++ b/ipapython/dnssec/localhsm.py
@@ -18,6 +18,8 @@ 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",
diff --git a/ipapython/install/core.py b/ipapython/install/core.py
index 8593690b3..98ee588d0 100644
--- a/ipapython/install/core.py
+++ b/ipapython/install/core.py
@@ -19,6 +19,8 @@ from ipapython.ipa_log_manager import root_logger
from . import util
from .util import from_
+# pylint: disable=unused-variable
+
__all__ = ['InvalidStateError', 'KnobValueError', 'Property', 'Knob',
'Configurable', 'Group', 'Component', 'Composite']
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 704e71a94..2dfc5b350 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -44,6 +44,8 @@ from ipapython.dn import DN
from ipapython.dnsutil import DNSName
from ipapython.kerberos import Principal
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 62d029d41..a7fd4edbb 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -54,6 +54,8 @@ 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
diff --git a/ipapython/p11helper.py b/ipapython/p11helper.py
index 5ff9ccc4e..0001b6a34 100644
--- a/ipapython/p11helper.py
+++ b/ipapython/p11helper.py
@@ -12,6 +12,8 @@ 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
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index 1cc7ce56a..4e3cccb06 100644
--- a/ipapython/sysrestore.py
+++ b/ipapython/sysrestore.py
@@ -35,6 +35,8 @@ 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
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 71b8ba6f1..fd4e6d350 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -63,6 +63,8 @@ from ipaplatform.paths import paths
from ldap.filter import escape_filter_chars
from time import sleep
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
long = int
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 5c3bdac1a..a04822e2d 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -60,6 +60,8 @@ from ipalib.util import (validate_zonemgr_str, normalize_zonemgr,
UnresolvableRecordError)
from ipalib.constants import CACERT
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index dcda19a22..b23ccfddb 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -15,6 +15,8 @@ from ipalib import api, certstore, x509
from ipapython.dn import DN
from ipapython.ipa_log_manager import root_logger
+# pylint: disable=unused-variable
+
external_cert_file = None
external_ca_file = None
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index c81b8f5b2..dea111025 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -81,6 +81,7 @@ try:
except ImportError:
import http.client as httplib
+# pylint: disable=unused-variable
# We need to reset the template because the CA uses the regular boot
# information
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 693a00dd7..b55bb6c4b 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -45,6 +45,8 @@ from ipalib.text import _
from ipaplatform.constants import constants
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
# Apache needs access to this database so we need to create it
# where apache can reach
NSS_DIR = paths.HTTPD_ALIAS_DIR
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
index 912b94fb7..efff82ace 100644
--- a/ipaserver/install/dns.py
+++ b/ipaserver/install/dns.py
@@ -34,6 +34,8 @@ from ipaserver.install import ntpinstance
from ipaserver.install import odsexporterinstance
from ipaserver.install import opendnssecinstance
+# pylint: disable=unused-variable
+
ip_addresses = []
reverse_zones = []
diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py
index fadaf216e..3e862b302 100644
--- a/ipaserver/install/dnskeysyncinstance.py
+++ b/ipaserver/install/dnskeysyncinstance.py
@@ -28,6 +28,8 @@ from ipalib import errors, api
from ipalib.constants import CACERT
from ipaserver.install.bindinstance import dns_container_exists
+# pylint: disable=unused-variable
+
softhsm_token_label = u'ipaDNSSEC'
softhsm_slot = 0
replica_keylabel_template = u"dnssec-replica:%s"
diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
index b65628277..ea80a2f02 100644
--- a/ipaserver/install/dogtaginstance.py
+++ b/ipaserver/install/dogtaginstance.py
@@ -45,6 +45,8 @@ from ipaserver.install import replication
from ipaserver.install.installutils import stopped_service
from ipapython.ipa_log_manager import log_mgr
+# pylint: disable=unused-variable
+
HTTPD_USER = constants.HTTPD_USER
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 26cd2461a..30e0038a2 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -52,6 +52,8 @@ from ipapython.admintool import ScriptError
from ipaplatform import services
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
DS_USER = platformconstants.DS_USER
DS_GROUP = platformconstants.DS_GROUP
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 9b09f4293..3c38e6ff1 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -40,6 +40,8 @@ from ipalib.constants import CACERT
from ipaplatform.constants import constants
from ipaplatform.tasks import tasks
+# pylint: disable=unused-variable
+
"""
A test gpg can be generated like this:
diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py
index 32ef25c7a..e691f4112 100644
--- a/ipaserver/install/ipa_cacert_manage.py
+++ b/ipaserver/install/ipa_cacert_manage.py
@@ -31,6 +31,8 @@ from ipaplatform.paths import paths
from ipalib import api, errors, x509, certstore
from ipaserver.install import certs, cainstance, installutils
+# pylint: disable=unused-variable
+
class CACertManage(admintool.AdminTool):
command_name = 'ipa-cacert-manage'
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py
index 9467276f2..e58f9b6c8 100644
--- a/ipaserver/install/ipa_replica_prepare.py
+++ b/ipaserver/install/ipa_replica_prepare.py
@@ -43,6 +43,7 @@ from ipalib import errors
from ipaplatform.paths import paths
from ipalib.constants import CACERT, DOMAIN_LEVEL_0
+# pylint: disable=unused-variable
UNSUPPORTED_DOMAIN_LEVEL_TEMPLATE = """
Replica creation using '{command_name}' to generate replica file
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index e172a303e..9cafa685c 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -51,6 +51,7 @@ try:
except ImportError:
adtrustinstance = None
+# pylint: disable=unused-variable
def recursive_chown(path, uid, gid):
'''
diff --git a/ipaserver/install/ipa_winsync_migrate.py b/ipaserver/install/ipa_winsync_migrate.py
index 55c905727..cf89366b3 100644
--- a/ipaserver/install/ipa_winsync_migrate.py
+++ b/ipaserver/install/ipa_winsync_migrate.py
@@ -29,6 +29,8 @@ from ipapython.dn import DN
from ipapython.ipautil import realm_to_suffix, posixify
from ipaserver.install import replication, installutils
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py
index f0c512ba0..39ea19623 100644
--- a/ipaserver/install/opendnssecinstance.py
+++ b/ipaserver/install/opendnssecinstance.py
@@ -20,6 +20,8 @@ from ipaplatform.paths import paths
from ipalib import errors, api
from ipaserver.install import dnskeysyncinstance
+# pylint: disable=unused-variable
+
KEYMASTER = u'dnssecKeyMaster'
softhsm_slot = 0
diff --git a/ipaserver/install/plugins/rename_managed.py b/ipaserver/install/plugins/rename_managed.py
index 1d0ed0f0d..96da85fc2 100644
--- a/ipaserver/install/plugins/rename_managed.py
+++ b/ipaserver/install/plugins/rename_managed.py
@@ -24,6 +24,8 @@ from ipalib import Updater
from ipapython import ipautil
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
register = Registry()
if six.PY3:
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 56c75e709..e9fa796b7 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -38,6 +38,8 @@ from ipapython.dn import DN
from ipaplatform import services
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index ff50bef44..0bc969102 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -59,6 +59,8 @@ except ImportError:
from .common import BaseServer, BaseServerCA
+# pylint: disable=unused-variable
+
SYSRESTORE_DIR_PATH = paths.SYSRESTORE
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index aefe158df..27e9f5797 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -47,6 +47,8 @@ from binascii import hexlify
from .common import BaseServer
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index b47d8fa45..2893a29da 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -49,6 +49,8 @@ from ipaserver.install import dogtaginstance
from ipaserver.install.upgradeinstance import IPAUpgrade
from ipaserver.install.ldapupdate import BadSyntax
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py
index 81e3beb8e..2ecbfb6ce 100644
--- a/ipaserver/install/upgradeinstance.py
+++ b/ipaserver/install/upgradeinstance.py
@@ -30,6 +30,8 @@ from ipaserver.install import schemaupdate
from ipaserver.install import ldapupdate
from ipaserver.install import service
+# pylint: disable=unused-variable
+
DSE = 'dse.ldif'
diff --git a/ipaserver/plugins/aci.py b/ipaserver/plugins/aci.py
index 56478272b..840652bda 100644
--- a/ipaserver/plugins/aci.py
+++ b/ipaserver/plugins/aci.py
@@ -132,6 +132,8 @@ from .baseldap import gen_pkey_only_option, pkey_to_value
from ipapython.ipa_log_manager import root_logger
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py
index e2669ca23..fe47cbe1b 100644
--- a/ipaserver/plugins/baseldap.py
+++ b/ipaserver/plugins/baseldap.py
@@ -39,6 +39,8 @@ from ipalib.messages import add_message, SearchResultTruncated
from ipapython.dn import DN
from ipapython.version import API_VERSION
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
index dcc829087..f9c5d73cc 100644
--- a/ipaserver/plugins/cert.py
+++ b/ipaserver/plugins/cert.py
@@ -53,6 +53,8 @@ from ipapython.dn import DN
from ipapython.ipa_log_manager import root_logger
from ipaserver.plugins.service import normalize_principal, validate_realm
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/dns.py b/ipaserver/plugins/dns.py
index 0c880f8cc..e1c4e249d 100644
--- a/ipaserver/plugins/dns.py
+++ b/ipaserver/plugins/dns.py
@@ -85,6 +85,8 @@ from ipaserver.dns_data_management import (
IPADomainIsNotManagedByIPAError,
)
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index ffe6ead26..d7f86736a 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -259,6 +259,8 @@ if api.env.in_server:
import pki.crypto as cryptoutil
from pki.kra import KRAClient
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/idrange.py b/ipaserver/plugins/idrange.py
index 3e9db0b6b..ba0a677b0 100644
--- a/ipaserver/plugins/idrange.py
+++ b/ipaserver/plugins/idrange.py
@@ -26,6 +26,8 @@ from ipalib import api, Int, Str, StrEnum, _, ngettext
from ipalib import errors
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py
index 1d7cba246..36499e3ff 100644
--- a/ipaserver/plugins/idviews.py
+++ b/ipaserver/plugins/idviews.py
@@ -40,6 +40,8 @@ from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/migration.py b/ipaserver/plugins/migration.py
index 404c4aeb0..b1fcdea1a 100644
--- a/ipaserver/plugins/migration.py
+++ b/ipaserver/plugins/migration.py
@@ -40,6 +40,8 @@ from ipapython.kerberos import Principal
import datetime
from ipaplatform.paths import paths
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/permission.py b/ipaserver/plugins/permission.py
index 0c040ce87..593198be4 100644
--- a/ipaserver/plugins/permission.py
+++ b/ipaserver/plugins/permission.py
@@ -33,6 +33,8 @@ from ipalib.aci import ACI
from ipapython.dn import DN
from ipalib.request import context
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/stageuser.py b/ipaserver/plugins/stageuser.py
index a219e3dac..5fbd313a9 100644
--- a/ipaserver/plugins/stageuser.py
+++ b/ipaserver/plugins/stageuser.py
@@ -50,6 +50,8 @@ from ipaplatform.paths import paths
from ipapython.ipautil import ipa_generate_password, GEN_TMP_PWD_LEN
from ipalib.capabilities import client_has_capability
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/trust.py b/ipaserver/plugins/trust.py
index 6e6f6c591..4ea19d918 100644
--- a/ipaserver/plugins/trust.py
+++ b/ipaserver/plugins/trust.py
@@ -45,6 +45,8 @@ from ipalib import output
from ldap import SCOPE_SUBTREE
from time import sleep
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/plugins/user.py b/ipaserver/plugins/user.py
index d690f01ab..239838db9 100644
--- a/ipaserver/plugins/user.py
+++ b/ipaserver/plugins/user.py
@@ -69,6 +69,8 @@ from ipalib.capabilities import client_has_capability
if api.env.in_server:
from ipaserver.plugins.ldap2 import ldap2
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index f1d5a4069..83b54c3e9 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -64,6 +64,8 @@ from ipaplatform.paths import paths
from ipapython.version import VERSION
from ipalib.text import _
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipatests/pytest_plugins/integration.py b/ipatests/pytest_plugins/integration.py
index 63d0c9943..ab1054881 100644
--- a/ipatests/pytest_plugins/integration.py
+++ b/ipatests/pytest_plugins/integration.py
@@ -34,6 +34,7 @@ from ipatests.test_integration import tasks
from ipatests.test_integration.config import Config
from ipatests.test_integration.env_config import get_global_config
+# pylint: disable=unused-variable
log = log_mgr.get_logger(__name__)
diff --git a/ipatests/test_install/test_updates.py b/ipatests/test_install/test_updates.py
index 01e06ca2e..e6761adc3 100644
--- a/ipatests/test_install/test_updates.py
+++ b/ipatests/test_install/test_updates.py
@@ -34,6 +34,8 @@ from ipapython import ipautil, ipaldap
from ipaplatform.paths import paths
from ipapython.dn import DN
+# pylint: disable=unused-variable
+
"""
The updater works through files only so this is just a thin-wrapper controlling
which file we test at any given point.
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 6b3082a78..6c26626f2 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -44,6 +44,8 @@ from ipalib.util import get_reverse_zone_default, verify_host_resolvable
from ipalib.constants import DOMAIN_SUFFIX_NAME
from ipalib.constants import DOMAIN_LEVEL_0
+# pylint: disable=unused-variable
+
log = log_mgr.get_logger(__name__)
diff --git a/ipatests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py
index 6a0e488e1..f160b7fa2 100644
--- a/ipatests/test_ipalib/test_frontend.py
+++ b/ipatests/test_ipalib/test_frontend.py
@@ -36,6 +36,8 @@ from ipalib import output, messages
from ipalib.parameters import Str
from ipapython.version import API_VERSION
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py
index 621dace59..64259d19b 100644
--- a/ipatests/test_ipalib/test_parameters.py
+++ b/ipatests/test_ipalib/test_parameters.py
@@ -43,6 +43,8 @@ from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR
from ipalib.errors import ValidationError, ConversionError
from ipalib import _
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
long = int
diff --git a/ipatests/test_ipalib/test_rpc.py b/ipatests/test_ipalib/test_rpc.py
index ae83a5d10..de63b2aea 100644
--- a/ipatests/test_ipalib/test_rpc.py
+++ b/ipatests/test_ipalib/test_rpc.py
@@ -34,6 +34,8 @@ from ipalib.request import context, Connection
from ipalib import rpc, errors, api, request
from ipapython.version import API_VERSION
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipatests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py
index b739de0b9..858264ede 100644
--- a/ipatests/test_ipaserver/test_rpcserver.py
+++ b/ipatests/test_ipaserver/test_rpcserver.py
@@ -30,6 +30,8 @@ from ipatests.util import assert_equal, raises, PluginTester
from ipalib import errors
from ipaserver import rpcserver
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/ipatests/test_ipaserver/test_serverroles.py b/ipatests/test_ipaserver/test_serverroles.py
index 370e86dde..63ed5f84b 100644
--- a/ipatests/test_ipaserver/test_serverroles.py
+++ b/ipatests/test_ipaserver/test_serverroles.py
@@ -15,6 +15,7 @@ from ipalib import api, create_api, errors
from ipapython.dn import DN
from ipatests.util import MockLDAP
+# pylint: disable=unused-variable
def _make_service_entry_mods(enabled=True, other_config=None):
mods = {
diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py
index bd3ed00be..c37262a43 100644
--- a/ipatests/test_xmlrpc/test_sudorule_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py
@@ -29,6 +29,8 @@ from ipalib import api
from ipalib import errors
import pytest
+# pylint: disable=unused-variable
+
if six.PY3:
unicode = str
diff --git a/pylintrc b/pylintrc
index 5f867bdc1..8643f8d87 100644
--- a/pylintrc
+++ b/pylintrc
@@ -55,7 +55,6 @@ disable=
undefined-loop-variable,
unnecessary-lambda,
unused-argument,
- unused-variable,
useless-else-on-loop,
bad-continuation,
bad-whitespace,
@@ -93,3 +92,7 @@ reports=no
# Template used to display messages. This is a python new-style format string
# used to format the message information. See doc for all details
msg-template='{path}:{line}: [{msg_id}({symbol}), {obj}] {msg})'
+
+
+[VARIABLES]
+dummy-variables-rgx=_.+