Remove unused imports

This patch removes unused imports, alse pylint has been configured to
check unused imports.

Reviewed-By: Jan Cholasta <jcholast@redhat.com>

43 files changed, 78 insertions, 117 deletions

diff --git a/ipalib/cli.py b/ipalib/cli.py
index 567b59946..f3cd6147f 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -41,7 +41,7 @@ if six.PY3:
 
 try:
     #pylint: disable=F0401
-    import default_encoding_utf8
+    import default_encoding_utf8  # pylint: disable=unused-import
 except ImportError:
     # This is a chicken-and-egg problem. The api can't be imported unless
     # this is already installed and since it is installed with IPA therein
@@ -59,8 +59,7 @@ from ipalib.errors import (PublicError, CommandError, HelpError, InternalError,
 from ipalib.constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
 from ipalib.parameters import File, Str, Enum, Any, Flag
 from ipalib.text import _
-from ipalib import api
-from ipapython.version import API_VERSION
+from ipalib import api  # pylint: disable=unused-import
 from ipapython.dnsutil import DNSName
 
 import datetime
diff --git a/ipalib/crud.py b/ipalib/crud.py
index 3a8a21791..4928c7f7d 100644
--- a/ipalib/crud.py
+++ b/ipalib/crud.py
@@ -119,7 +119,7 @@ For example, compare ``user.params`` with ``user_add.output_params`` and
 Note that the above are all equal.
 """
 
-from ipalib.frontend import Method, Object
+from ipalib.frontend import Method
 from ipalib import backend
 from ipalib import parameters
 from ipalib import output
diff --git a/ipalib/errors.py b/ipalib/errors.py
index b82d19949..52b770027 100644
--- a/ipalib/errors.py
+++ b/ipalib/errors.py
@@ -106,7 +106,7 @@ import six
 
 from ipalib.text import ngettext as ungettext
 from ipalib import messages
-from ipaplatform.paths import paths
+from ipaplatform.paths import paths  # pylint: disable=unused-import
 
 
 class PrivateError(Exception):
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 4c7563a6b..8d5142ac2 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -23,7 +23,6 @@ Base classes for all front-end plugins.
 
 import re
 from distutils import version
-from textwrap import wrap
 
 import six
 
@@ -32,7 +31,8 @@ from ipapython.ipa_log_manager import root_logger
 from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
 from ipalib.base import NameSpace
 from ipalib.plugable import Plugin
-from ipalib.parameters import create_param, Param, Str, Flag, Password
+from ipalib.parameters import create_param, Param, Str, Flag
+from ipalib.parameters import Password  # pylint: disable=unused-import
 from ipalib.output import Output, Entry, ListOfEntries
 from ipalib.text import _
 from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
diff --git a/ipalib/output.py b/ipalib/output.py
index 5eb8b6b8e..92a1496e5 100644
--- a/ipalib/output.py
+++ b/ipalib/output.py
@@ -20,9 +20,6 @@
 """
 Simple description of return values.
 """
-
-from inspect import getdoc
-
 import six
 
 from ipalib.plugable import ReadOnly, lock
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index dadd87d6a..e46068c96 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -104,13 +104,12 @@ import decimal
 import base64
 import datetime
 from six.moves.xmlrpc_client import MAXINT, MININT
-import encodings.idna
 
-import dns.name
 import six
 
 from ipalib.text import _ as ugettext
-from ipalib.plugable import ReadOnly, lock, check_name
+from ipalib.base import check_name
+from ipalib.plugable import ReadOnly, lock
 from ipalib.errors import ConversionError, RequirementError, ValidationError
 from ipalib.errors import PasswordMismatch, Base64DecodeError
 from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
diff --git a/ipalib/pkcs10.py b/ipalib/pkcs10.py
index 7b0d8f733..e340c1a20 100644
--- a/ipalib/pkcs10.py
+++ b/ipalib/pkcs10.py
@@ -19,7 +19,6 @@
 
 from __future__ import print_function
 
-import os
 import sys
 import base64
 import nss.nss as nss
@@ -27,9 +26,6 @@ from pyasn1.type import univ, char, namedtype, tag
 from pyasn1.codec.der import decoder
 import six
 
-from ipapython import ipautil
-from ipalib import api
-
 if six.PY3:
     unicode = str
 
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 2b593ec3b..552234327 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -25,7 +25,6 @@ you are unfamiliar with this Python feature, see
 http://docs.python.org/ref/sequence-types.html
 """
 
-import re
 import sys
 import inspect
 import threading
@@ -42,7 +41,7 @@ from ipalib import errors
 from ipalib.config import Env
 from ipalib import text
 from ipalib.text import _
-from ipalib.base import ReadOnly, NameSpace, lock, islocked, check_name
+from ipalib.base import ReadOnly, NameSpace, lock, islocked
 from ipalib.constants import DEFAULT_CONFIG
 from ipapython.ipa_log_manager import *
 from ipapython.version import VERSION, API_VERSION
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py
index a909f6c39..5e04a6b93 100644
--- a/ipalib/plugins/automount.py
+++ b/ipalib/plugins/automount.py
@@ -23,7 +23,6 @@ import os
 import six
 
 from ipalib import api, errors
-from ipalib import Object, Command
 from ipalib import Flag, Str, IA5Str
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 1c822ecda..5f7b7fba1 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -35,7 +35,7 @@ from ipalib import output
 from ipalib.text import _
 from ipalib.util import json_serialize, validate_hostname
 from ipalib.capabilities import client_has_capability
-from ipapython.dn import DN, RDN
+from ipapython.dn import DN
 from ipapython.version import API_VERSION
 
 if six.PY3:
diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py
index ae7fad462..a19229ab7 100644
--- a/ipalib/plugins/baseuser.py
+++ b/ipalib/plugins/baseuser.py
@@ -17,10 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from time import gmtime, strftime
 import string
-import posixpath
-import os
 
 import six
 
@@ -31,14 +28,10 @@ from ipalib.plugins.baseldap import (
     DN, LDAPObject, LDAPCreate, LDAPUpdate, LDAPSearch, LDAPDelete,
     LDAPRetrieve, LDAPAddMember, LDAPRemoveMember)
 from ipalib.plugins.service import validate_certificate
-from ipalib.plugins import baseldap
 from ipalib.request import context
-from ipalib import _, ngettext
-from ipalib import output
-from ipaplatform.paths import paths
+from ipalib import _
 from ipapython.ipautil import ipa_generate_password
 from ipapython.ipavalidate import Email
-from ipalib.capabilities import client_has_capability
 from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
     convert_sshpubkey_post)
 
diff --git a/ipalib/plugins/batch.py b/ipalib/plugins/batch.py
index 7a4cda2a0..626ba2835 100644
--- a/ipalib/plugins/batch.py
+++ b/ipalib/plugins/batch.py
@@ -51,7 +51,6 @@ from ipalib import api, errors
 from ipalib import Command
 from ipalib.parameters import Str, Any
 from ipalib.output import Output
-from ipalib import output
 from ipalib.text import _
 from ipalib.request import context
 from ipalib.plugable import Registry
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py
index b4ea2feae..615f7ac25 100644
--- a/ipalib/plugins/cert.py
+++ b/ipalib/plugins/cert.py
@@ -23,7 +23,7 @@ import os
 import time
 import binascii
 
-from ipalib import Command, Str, Int, Bytes, Flag, File
+from ipalib import Command, Str, Int, Flag, File
 from ipalib import api
 from ipalib import errors
 from ipalib import pkcs10
@@ -36,8 +36,6 @@ from ipalib.plugins.baseldap import pkey_to_value
 from ipalib.plugins.service import split_any_principal
 from ipalib.plugins.certprofile import validate_profile_id
 import ipalib.plugins.caacl
-import base64
-import traceback
 from ipalib.text import _
 from ipalib.request import context
 from ipalib import output
diff --git a/ipalib/plugins/certprofile.py b/ipalib/plugins/certprofile.py
index b075bf476..6329d84c3 100644
--- a/ipalib/plugins/certprofile.py
+++ b/ipalib/plugins/certprofile.py
@@ -3,12 +3,10 @@
 #
 
 import re
-from operator import attrgetter
 
 from ipalib import api, Bool, File, Str
-from ipalib import output, util
+from ipalib import util
 from ipalib.plugable import Registry
-from ipalib.plugins.virtual import VirtualCommand
 from ipalib.plugins.baseldap import (
     LDAPObject, LDAPSearch, LDAPCreate,
     LDAPDelete, LDAPUpdate, LDAPRetrieve)
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index 86b7ca863..055a8211b 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -24,7 +24,6 @@ from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
 from ipalib.plugins.selinuxusermap import validate_selinuxuser
 from ipalib import _
-from ipalib.errors import ValidationError
 
 # 389-ds attributes that should be skipped in attribute checks
 OPERATIONAL_ATTRIBUTES = ('nsaccountlock', 'member', 'memberof',
diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py
index e96114626..ca30890f7 100644
--- a/ipalib/plugins/delegation.py
+++ b/ipalib/plugins/delegation.py
@@ -18,12 +18,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib import api, _, ngettext
-from ipalib import Flag, Str
-from ipalib.request import context
-from ipalib import api, crud, errors
+from ipalib import _, ngettext
+from ipalib import Str
+from ipalib import api, crud
 from ipalib import output
-from ipalib import Object, Command
+from ipalib import Object
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
 
diff --git a/ipalib/plugins/domainlevel.py b/ipalib/plugins/domainlevel.py
index 838a518e7..23fa2a1b2 100644
--- a/ipalib/plugins/domainlevel.py
+++ b/ipalib/plugins/domainlevel.py
@@ -10,7 +10,6 @@ from ipalib import errors
 from ipalib import output
 from ipalib.parameters import Int
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import LDAPObject, LDAPUpdate, LDAPRetrieve
 
 from ipapython.dn import DN
 
diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py
index 82a52bd80..aa0e79c17 100644
--- a/ipalib/plugins/hbacrule.py
+++ b/ipalib/plugins/hbacrule.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipalib import api, errors
-from ipalib import AccessTime, Password, Str, StrEnum, Bool, DeprecatedParam
+from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
 from ipalib import _, ngettext
diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py
index 2bc92cb24..71df7fdbc 100644
--- a/ipalib/plugins/hbacsvcgroup.py
+++ b/ipalib/plugins/hbacsvcgroup.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib import api, errors
+from ipalib import api
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
 from ipalib import _, ngettext
diff --git a/ipalib/plugins/hbactest.py b/ipalib/plugins/hbactest.py
index 5999b6bf5..fb0c03389 100644
--- a/ipalib/plugins/hbactest.py
+++ b/ipalib/plugins/hbactest.py
@@ -19,8 +19,7 @@
 
 from ipalib import api, errors, output, util
 from ipalib import Command, Str, Flag, Int, DeprecatedParam
-from ipalib.cli import to_cli
-from ipalib import _, ngettext
+from ipalib import _
 from ipapython.dn import DN
 from ipalib.plugable import Registry
 if api.env.in_server and api.env.context in ['lite', 'server']:
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index 842dff042..d9be712d6 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -18,7 +18,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from nss.error import NSPRError
 import string
 
 import six
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 1c58b6bd1..276e92da8 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -26,7 +26,6 @@ from __future__ import print_function
 
 import json
 
-from ipalib import api
 from ipalib import Command
 from ipalib import Str
 from ipalib.output import Output
diff --git a/ipalib/plugins/misc.py b/ipalib/plugins/misc.py
index 67bb92952..4284f0c6c 100644
--- a/ipalib/plugins/misc.py
+++ b/ipalib/plugins/misc.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
-from ipalib import api, LocalOrRemote, _, ngettext
+from ipalib import LocalOrRemote, _, ngettext
 from ipalib.output import Output, summary
 from ipalib import Flag
 from ipalib.plugable import Registry
diff --git a/ipalib/plugins/otptoken.py b/ipalib/plugins/otptoken.py
index 846155dfb..2d7e99d06 100644
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -23,7 +23,11 @@ from ipalib.plugins.baseldap import DN, LDAPObject, LDAPAddMember, LDAPRemoveMem
 from ipalib.plugins.baseldap import LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
 from ipalib import api, Int, Str, Bool, DateTime, Flag, Bytes, IntEnum, StrEnum, Password, _, ngettext
 from ipalib.plugable import Registry
-from ipalib.errors import PasswordMismatch, ConversionError, LastMemberError, NotFound, ValidationError
+from ipalib.errors import (
+    PasswordMismatch,
+    ConversionError,
+    NotFound,
+    ValidationError)
 from ipalib.request import context
 from ipalib.frontend import Local
 from ipaplatform.paths import paths
diff --git a/ipalib/plugins/passwd.py b/ipalib/plugins/passwd.py
index a4f791c1b..2f303472c 100644
--- a/ipalib/plugins/passwd.py
+++ b/ipalib/plugins/passwd.py
@@ -23,7 +23,7 @@ from ipalib import Str, Password
 from ipalib import _
 from ipalib import output
 from ipalib.plugable import Registry
-from ipalib.plugins.user import split_principal, validate_principal, normalize_principal
+from ipalib.plugins.baseuser import validate_principal, normalize_principal
 from ipalib.request import context
 from ipapython.dn import DN
 
diff --git a/ipalib/plugins/ping.py b/ipalib/plugins/ping.py
index 52da5d4bc..6a514125c 100644
--- a/ipalib/plugins/ping.py
+++ b/ipalib/plugins/ping.py
@@ -19,7 +19,7 @@
 
 from ipalib import Command
 from ipalib import output
-from ipalib import _, ngettext
+from ipalib import _
 from ipalib.plugable import Registry
 from ipapython.version import VERSION, API_VERSION
 
diff --git a/ipalib/plugins/pkinit.py b/ipalib/plugins/pkinit.py
index 5f00b2b46..9aa101063 100644
--- a/ipalib/plugins/pkinit.py
+++ b/ipalib/plugins/pkinit.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipalib import api, errors
-from ipalib import Int, Str
+from ipalib import Str
 from ipalib import Object, Command
 from ipalib import _
 from ipalib.plugable import Registry
diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py
index 6d8d544aa..82e2a5571 100644
--- a/ipalib/plugins/role.py
+++ b/ipalib/plugins/role.py
@@ -21,8 +21,6 @@
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
 from ipalib import api, Str, _, ngettext
-from ipalib import Command
-from ipalib.plugins import privilege
 
 __doc__ = _("""
 Roles
diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py
index 9cf6900d1..f733768bc 100644
--- a/ipalib/plugins/selfservice.py
+++ b/ipalib/plugins/selfservice.py
@@ -17,12 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib import api, _, ngettext
-from ipalib import Flag, Str
-from ipalib.request import context
+from ipalib import _, ngettext
+from ipalib import Str
 from ipalib import api, crud, errors
 from ipalib import output
-from ipalib import Object, Command
+from ipalib import Object
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
 
diff --git a/ipalib/plugins/server.py b/ipalib/plugins/server.py
index 6286c5959..4f1959a25 100644
--- a/ipalib/plugins/server.py
+++ b/ipalib/plugins/server.py
@@ -2,9 +2,6 @@
 # Copyright (C) 2015  FreeIPA Contributors see COPYING for license
 #
 
-import string
-import os
-
 import dbus
 import dbus.mainloop.glib
 
@@ -12,7 +9,6 @@ from ipalib import api, crud, errors, messages
 from ipalib import Int, Str
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
-from ipalib.plugins import baseldap
 from ipalib.request import context
 from ipalib import _, ngettext
 
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py
index 4752e198b..4ef4d4362 100644
--- a/ipalib/plugins/service.py
+++ b/ipalib/plugins/service.py
@@ -19,21 +19,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import base64
-import os
-
 import six
 
-from ipalib import api, errors, util
-from ipalib import Str, Flag, Bytes, StrEnum, Bool
+from ipalib import api, errors
+from ipalib import Bytes, StrEnum, Bool
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
 from ipalib import x509
 from ipalib import _, ngettext
 from ipalib import util
 import nss.nss as nss
-from nss.error import NSPRError
-from ipapython.ipautil import file_exists
+
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py
index 995f67923..bbbaf55a5 100644
--- a/ipalib/plugins/stageuser.py
+++ b/ipalib/plugins/stageuser.py
@@ -17,35 +17,40 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from time import gmtime, strftime
-import string
 import posixpath
-import os
 from copy import deepcopy
 
 import six
 
 from ipalib import api, errors
-from ipalib import (Flag, Int, Password, Str, Bool, StrEnum, DateTime,
-                    DeprecatedParam)
+from ipalib import DeprecatedParam
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import LDAPCreate, LDAPQuery, LDAPSearch, DN, entry_to_dict, pkey_to_value
+from ipalib.plugins.baseldap import (
+    LDAPCreate,
+    LDAPQuery,
+    DN,
+    entry_to_dict,
+    pkey_to_value)
 from ipalib.plugins import baseldap
 from ipalib.plugins.baseuser import (
-    baseuser, baseuser_add, baseuser_del, baseuser_mod, baseuser_find,
-    baseuser_show, NO_UPG_MAGIC, radius_dn2pk, baseuser_pwdchars,
-    fix_addressbook_permission_bindrule, normalize_principal,
-    validate_principal, baseuser_output_params, status_baseuser_output_params,
-    baseuser_add_manager, baseuser_remove_manager)
+    baseuser,
+    baseuser_add,
+    baseuser_del,
+    baseuser_mod,
+    baseuser_find,
+    baseuser_show,
+    NO_UPG_MAGIC,
+    baseuser_pwdchars,
+    baseuser_output_params,
+    status_baseuser_output_params,
+    baseuser_add_manager,
+    baseuser_remove_manager)
 from ipalib.request import context
 from ipalib import _, ngettext
 from ipalib import output
 from ipaplatform.paths import paths
 from ipapython.ipautil import ipa_generate_password
-from ipapython.ipavalidate import Email
 from ipalib.capabilities import client_has_capability
-from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
-    convert_sshpubkey_post)
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py
index 4654ecc88..37776adc0 100644
--- a/ipalib/plugins/sudocmd.py
+++ b/ipalib/plugins/sudocmd.py
@@ -17,11 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import platform
-import os
-import sys
-
-from ipalib import api, errors, util
+from ipalib import api, errors
 from ipalib import Str
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
diff --git a/ipalib/plugins/topology.py b/ipalib/plugins/topology.py
index 128a34748..f397300ad 100644
--- a/ipalib/plugins/topology.py
+++ b/ipalib/plugins/topology.py
@@ -5,7 +5,7 @@
 import six
 
 from ipalib import api, errors
-from ipalib import Int, Str, Bool, StrEnum, Flag, DNParam
+from ipalib import Int, Str, StrEnum, Flag, DNParam
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import (
     LDAPObject, LDAPSearch, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPQuery,
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 2b792af62..0017c09d7 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -19,21 +19,30 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from time import gmtime, strftime
-import string
 import posixpath
 import os
 
 import six
 
-from ipalib import api, errors, util
-from ipalib import Flag, Int, Password, Str, Bool, StrEnum, DateTime
+from ipalib import util
+from ipalib import Bool
 from ipalib.plugins.baseuser import (
-    baseuser, baseuser_add, baseuser_del, baseuser_mod, baseuser_find,
-    baseuser_show, NO_UPG_MAGIC, UPG_DEFINITION_DN, baseuser_output_params,
-    status_baseuser_output_params, baseuser_pwdchars, validate_nsaccountlock,
-    radius_dn2pk, convert_nsaccountlock, split_principal, validate_principal,
-    normalize_principal, fix_addressbook_permission_bindrule,
-    baseuser_add_manager, baseuser_remove_manager)
+    baseuser,
+    baseuser_add,
+    baseuser_del,
+    baseuser_mod,
+    baseuser_find,
+    baseuser_show,
+    NO_UPG_MAGIC,
+    UPG_DEFINITION_DN,
+    baseuser_output_params,
+    status_baseuser_output_params,
+    baseuser_pwdchars,
+    validate_nsaccountlock,
+    convert_nsaccountlock,
+    fix_addressbook_permission_bindrule,
+    baseuser_add_manager,
+    baseuser_remove_manager)
 from ipalib.plugins.idviews import remove_ipaobject_overrides
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import *
@@ -44,10 +53,8 @@ from ipalib import output
 from ipalib import x509
 from ipaplatform.paths import paths
 from ipapython.ipautil import ipa_generate_password
-from ipapython.ipavalidate import Email
 from ipalib.capabilities import client_has_capability
-from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
-    convert_sshpubkey_post)
+
 if api.env.in_server:
     from ipaserver.plugins.ldap2 import ldap2
 
diff --git a/ipalib/plugins/vault.py b/ipalib/plugins/vault.py
index f94bf9d65..0cf6f1d24 100644
--- a/ipalib/plugins/vault.py
+++ b/ipalib/plugins/vault.py
@@ -25,7 +25,6 @@ import io
 import json
 import os
 import sys
-import tempfile
 
 from cryptography.fernet import Fernet, InvalidToken
 from cryptography.hazmat.backends import default_backend
@@ -41,18 +40,17 @@ from ipalib.frontend import Command, Object, Local
 from ipalib import api, errors
 from ipalib import Bytes, Flag, Str, StrEnum
 from ipalib import output
-from ipalib.crud import PKQuery, Retrieve, Update
+from ipalib.crud import PKQuery, Retrieve
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import LDAPObject, LDAPCreate, LDAPDelete,\
     LDAPSearch, LDAPUpdate, LDAPRetrieve, LDAPAddMember, LDAPRemoveMember,\
     LDAPModMember, pkey_to_value
 from ipalib.request import context
-from ipalib.plugins.user import split_principal
+from ipalib.plugins.baseuser import split_principal
 from ipalib.plugins.service import normalize_principal
 from ipalib import _, ngettext
 from ipaplatform.paths import paths
 from ipapython.dn import DN
-from ipapython.nsslib import current_dbdir
 
 if api.env.in_server:
     import pki.account
diff --git a/ipalib/plugins/virtual.py b/ipalib/plugins/virtual.py
index 3bbe32e53..2ba69f651 100644
--- a/ipalib/plugins/virtual.py
+++ b/ipalib/plugins/virtual.py
@@ -20,7 +20,6 @@
 """
 Base classes for non-LDAP backend plugins.
 """
-from ipalib import api
 from ipalib import Command
 from ipalib import errors
 from ipapython.dn import DN
diff --git a/ipalib/request.py b/ipalib/request.py
index 5a6baba42..9484be58f 100644
--- a/ipalib/request.py
+++ b/ipalib/request.py
@@ -25,7 +25,7 @@ Per-request thread-local data.
 import threading
 
 from ipalib.base import ReadOnly, lock
-from ipalib.constants import OVERRIDE_ERROR, CALLABLE_ERROR
+from ipalib.constants import CALLABLE_ERROR
 
 
 # Thread-local storage of most per-request information
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 3664b265a..a165491ad 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -31,7 +31,6 @@ Also see the `ipaserver.rpcserver` module.
 """
 
 from decimal import Decimal
-import sys
 import datetime
 import os
 import locale
diff --git a/ipalib/setup.py.in b/ipalib/setup.py.in
index 47481dbe0..8107c81ff 100644
--- a/ipalib/setup.py.in
+++ b/ipalib/setup.py.in
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
 
 import os
 import sys
-import distutils.sysconfig
 
 CLASSIFIERS = """\
 Intended Audience :: System Environment/Base
diff --git a/ipalib/text.py b/ipalib/text.py
index 28953fa78..34e5f1a89 100644
--- a/ipalib/text.py
+++ b/ipalib/text.py
@@ -112,8 +112,6 @@ For additional details, see `GettextFactory` and `Gettext`, and for plural
 forms, see `NGettextFactory` and `NGettext`.
 """
 
-import threading
-import locale
 import gettext
 
 import six
diff --git a/ipalib/util.py b/ipalib/util.py
index c9a0237fb..6c70fbdfc 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -22,8 +22,6 @@ Various utility functions.
 """
 
 import os
-import imp
-import time
 import socket
 import re
 import decimal
diff --git a/ipalib/x509.py b/ipalib/x509.py
index 037d6785c..237c002c2 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -44,8 +44,6 @@ from pyasn1.type import univ, namedtype, tag
 from pyasn1.codec.der import decoder, encoder
 import six
 
-from ipapython import ipautil
-from ipalib import api
 from ipalib import _
 from ipalib import util
 from ipalib import errors