Use absolute imports

In Python 3, implicit relative imports will not be supported.
Use fully-qualified imports everywhere.

Reviewed-By: Tomas Babej <tbabej@redhat.com>

63 files changed, 159 insertions, 138 deletions

diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index 4ab152243..e163b292c 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -880,16 +880,16 @@ freeIPA.org:
 '''
 
 import os
-import plugable
-from backend import Backend
-from frontend import Command, LocalOrRemote, Updater
-from frontend import Object, Method
-from crud import Create, Retrieve, Update, Delete, Search
-from parameters import DefaultFrom, Bool, Flag, Int, Decimal, Bytes, Str, IA5Str, Password, DNParam, DeprecatedParam
-from parameters import (BytesEnum, StrEnum, IntEnum, AccessTime, File,
+from ipalib import plugable
+from ipalib.backend import Backend
+from ipalib.frontend import Command, LocalOrRemote, Updater
+from ipalib.frontend import Object, Method
+from ipalib.crud import Create, Retrieve, Update, Delete, Search
+from ipalib.parameters import DefaultFrom, Bool, Flag, Int, Decimal, Bytes, Str, IA5Str, Password, DNParam, DeprecatedParam
+from ipalib.parameters import (BytesEnum, StrEnum, IntEnum, AccessTime, File,
                         DateTime, DNSNameParam)
-from errors import SkipPluginModule
-from text import _, ngettext, GettextFactory, NGettextFactory
+from ipalib.errors import SkipPluginModule
+from ipalib.text import _, ngettext, GettextFactory, NGettextFactory
 
 version_info = (2, 0, 0, 'alpha', 0)
 if version_info[3] == 'final':
@@ -935,7 +935,7 @@ def create_api(mode='dummy'):
 api = create_api(mode=None)
 
 if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
-    from cli import cli_plugins
+    from ipalib.cli import cli_plugins
     api.bootstrap(context='cli', in_server=False, in_tree=True)
     for klass in cli_plugins:
         api.add_plugin(klass)
diff --git a/ipalib/backend.py b/ipalib/backend.py
index 240fae4b3..288a0edf2 100644
--- a/ipalib/backend.py
+++ b/ipalib/backend.py
@@ -22,10 +22,11 @@ Base classes for all backed-end plugins.
 """
 
 import threading
-import plugable
 import os
-from errors import PublicError, InternalError, CommandError
-from request import context, Connection, destroy_context
+
+from ipalib import plugable
+from ipalib.errors import PublicError, InternalError, CommandError
+from ipalib.request import context, Connection, destroy_context
 
 
 class Backend(plugable.Plugin):
diff --git a/ipalib/base.py b/ipalib/base.py
index 91259c7f3..12b2efd00 100644
--- a/ipalib/base.py
+++ b/ipalib/base.py
@@ -22,8 +22,9 @@ Foundational classes and functions.
 """
 
 import re
-from constants import NAME_REGEX, NAME_ERROR
-from constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
+
+from ipalib.constants import NAME_REGEX, NAME_ERROR
+from ipalib.constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
 
 
 class ReadOnly(object):
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 52904eada..abd691bc1 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -41,15 +41,15 @@ except ImportError:
     # even in cases that IPA isn't installed on the dev machine.
     pass
 
-import frontend
-import backend
-import plugable
-from errors import (PublicError, CommandError, HelpError, InternalError,
-                    NoSuchNamespaceError, ValidationError, NotFound,
-                    NotConfiguredError, PromptFailed)
-from constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
-from parameters import File, Str, Enum, Any, Flag
-from text import _
+from ipalib import frontend
+from ipalib import backend
+from ipalib import plugable
+from ipalib.errors import (PublicError, CommandError, HelpError, InternalError,
+                           NoSuchNamespaceError, ValidationError, NotFound,
+                           NotConfiguredError, PromptFailed)
+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 ipapython.dnsutil import DNSName
diff --git a/ipalib/config.py b/ipalib/config.py
index e8958205d..760fa5bdd 100644
--- a/ipalib/config.py
+++ b/ipalib/config.py
@@ -37,9 +37,9 @@ from os import path
 import sys
 from ipapython.dn import DN
 
-from base import check_name
-from constants import CONFIG_SECTION
-from constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
+from ipalib.base import check_name
+from ipalib.constants import CONFIG_SECTION
+from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
 
 
 class Env(object):
diff --git a/ipalib/crud.py b/ipalib/crud.py
index cd244156e..3a8a21791 100644
--- a/ipalib/crud.py
+++ b/ipalib/crud.py
@@ -119,10 +119,10 @@ For example, compare ``user.params`` with ``user_add.output_params`` and
 Note that the above are all equal.
 """
 
-from frontend import Method, Object
-import backend
-import parameters
-import output
+from ipalib.frontend import Method, Object
+from ipalib import backend
+from ipalib import parameters
+from ipalib import output
 from ipalib.text import _
 
 
diff --git a/ipalib/errors.py b/ipalib/errors.py
index 7e34a879f..e7b016674 100644
--- a/ipalib/errors.py
+++ b/ipalib/errors.py
@@ -103,8 +103,7 @@ current block assignments:
 """
 
 from ipalib.text import ngettext as ungettext
-
-import messages
+from ipalib import messages
 from ipaplatform.paths import paths
 
 
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 1fe7ff0f0..16ec9cce8 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -23,21 +23,21 @@ Base classes for all front-end plugins.
 
 import re
 from distutils import version
+from textwrap import wrap
 
 from ipapython.version import API_VERSION
 from ipapython.ipa_log_manager import root_logger
 from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
-from base import NameSpace
-from plugable import Plugin
-from parameters import create_param, Param, Str, Flag, Password
-from output import Output, Entry, ListOfEntries
-from text import _
-from errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
+from ipalib.base import NameSpace
+from ipalib.plugable import Plugin
+from ipalib.parameters import create_param, Param, Str, Flag, Password
+from ipalib.output import Output, Entry, ListOfEntries
+from ipalib.text import _
+from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
     VersionError, OptionError, InvocationError,
     ValidationError, ConversionError)
 from ipalib import messages
 from ipalib.util import json_serialize
-from textwrap import wrap
 
 
 RULE_FLAG = 'validation_rule'
diff --git a/ipalib/output.py b/ipalib/output.py
index 3501cddd2..68b2bf933 100644
--- a/ipalib/output.py
+++ b/ipalib/output.py
@@ -23,9 +23,10 @@ Simple description of return values.
 
 from inspect import getdoc
 from types import NoneType
-from plugable import ReadOnly, lock
-from capabilities import client_has_capability
-from text import _
+
+from ipalib.plugable import ReadOnly, lock
+from ipalib.capabilities import client_has_capability
+from ipalib.text import _
 
 
 class Output(ReadOnly):
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index 94bd018ca..6139fe8d8 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -104,19 +104,20 @@ import decimal
 import base64
 import datetime
 from xmlrpclib import MAXINT, MININT
-
 from types import NoneType
-from text import _ as ugettext
-from plugable import ReadOnly, lock, check_name
-from errors import ConversionError, RequirementError, ValidationError
-from errors import PasswordMismatch, Base64DecodeError
-from constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
-from text import Gettext, FixMe
-from util import json_serialize, validate_idna_domain
+import encodings.idna
+
+import dns.name
+
+from ipalib.text import _ as ugettext
+from ipalib.plugable import ReadOnly, lock, check_name
+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
+from ipalib.text import Gettext, FixMe
+from ipalib.util import json_serialize, validate_idna_domain
 from ipapython.dn import DN
 from ipapython.dnsutil import DNSName
-import dns.name
-import encodings.idna
 
 def _is_null(value):
     return not value and value != 0 # NOTE: False == 0
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 4f33ee374..17c78dce6 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -32,16 +32,16 @@ import threading
 import os
 from os import path
 import optparse
-import errors
 import textwrap
 import collections
 import importlib
 
-from config import Env
-import text
-from text import _
-from base import ReadOnly, NameSpace, lock, islocked, check_name
-from constants import DEFAULT_CONFIG
+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.constants import DEFAULT_CONFIG
 from ipapython.ipa_log_manager import *
 from ipapython.version import VERSION, API_VERSION
 
diff --git a/ipalib/request.py b/ipalib/request.py
index 15b26f598..a83b35403 100644
--- a/ipalib/request.py
+++ b/ipalib/request.py
@@ -23,8 +23,9 @@ Per-request thread-local data.
 """
 
 import threading
-from base import ReadOnly, lock
-from constants import OVERRIDE_ERROR, CALLABLE_ERROR
+
+from ipalib.base import ReadOnly, lock
+from ipalib.constants import OVERRIDE_ERROR, CALLABLE_ERROR
 
 
 # Thread-local storage of most per-request information
diff --git a/ipalib/session.py b/ipalib/session.py
index d7c6ce828..3e3c58529 100644
--- a/ipalib/session.py
+++ b/ipalib/session.py
@@ -18,12 +18,13 @@
 
 import memcache
 import random
-import errors
 import os
 import re
 import time
 from urllib2 import urlparse
-from text import _
+
+from ipalib import errors
+from ipalib.text import _
 from ipapython.ipa_log_manager import *
 from ipalib import api, errors
 from ipaplatform.paths import paths
diff --git a/ipalib/text.py b/ipalib/text.py
index dd6f3ff20..6b465a55b 100644
--- a/ipalib/text.py
+++ b/ipalib/text.py
@@ -115,7 +115,8 @@ forms, see `NGettextFactory` and `NGettext`.
 import threading
 import locale
 import gettext
-from request import context
+
+from ipalib.request import context
 
 
 def create_translation(key):
diff --git a/ipapython/dnssec/bindmgr.py b/ipapython/dnssec/bindmgr.py
index 2c6781609..1822dacf2 100644
--- a/ipapython/dnssec/bindmgr.py
+++ b/ipapython/dnssec/bindmgr.py
@@ -17,7 +17,7 @@ from ipapython.dn import DN
 from ipapython import ipa_log_manager, ipautil
 from ipaplatform.paths import paths
 
-from temp import TemporaryDirectory
+from ipapython.dnssec.temp import TemporaryDirectory
 
 time_bindfmt = '%Y%m%d%H%M%S'
 
diff --git a/ipapython/dnssec/keysyncer.py b/ipapython/dnssec/keysyncer.py
index 837602fb4..d1f400e2e 100644
--- a/ipapython/dnssec/keysyncer.py
+++ b/ipapython/dnssec/keysyncer.py
@@ -9,9 +9,9 @@ import os
 from ipaplatform.paths import paths
 from ipapython import ipautil
 
-from syncrepl import SyncReplConsumer
-from odsmgr import ODSMgr
-from bindmgr import BINDMgr
+from ipapython.dnssec.syncrepl import SyncReplConsumer
+from ipapython.dnssec.odsmgr import ODSMgr
+from ipapython.dnssec.bindmgr import BINDMgr
 
 SIGNING_ATTR = 'idnsSecInlineSigning'
 OBJCLASS_ATTR = 'objectClass'
diff --git a/ipapython/dnssec/ldapkeydb.py b/ipapython/dnssec/ldapkeydb.py
index 23e6b019c..86a7d0ac1 100644
--- a/ipapython/dnssec/ldapkeydb.py
+++ b/ipapython/dnssec/ldapkeydb.py
@@ -13,7 +13,8 @@ from ipapython import ipaldap
 from ipapython import ipautil
 from ipaplatform.paths import paths
 
-from abshsm import attrs_name2id, attrs_id2name, bool_attr_names, populate_pkcs11_metadata, AbstractHSM
+from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
+                                     bool_attr_names, populate_pkcs11_metadata)
 import _ipap11helper
 import uuid
 
diff --git a/ipapython/dnssec/localhsm.py b/ipapython/dnssec/localhsm.py
index 6176fbf00..412b55df9 100755
--- a/ipapython/dnssec/localhsm.py
+++ b/ipapython/dnssec/localhsm.py
@@ -14,7 +14,9 @@ import time
 from ipaplatform.paths import paths
 
 import _ipap11helper
-from abshsm import attrs_name2id, attrs_id2name, AbstractHSM, keytype_id2name, keytype_name2id, ldap2p11helper_api_params
+from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
+                                     keytype_id2name, keytype_name2id,
+                                     ldap2p11helper_api_params)
 
 private_key_api_params = set(["label", "id", "data", "unwrapping_key",
     "wrapping_mech", "key_type", "cka_always_authenticate", "cka_copyable",
diff --git a/ipapython/ipa_log_manager.py b/ipapython/ipa_log_manager.py
index c0a5c8d9d..8a555ebda 100644
--- a/ipapython/ipa_log_manager.py
+++ b/ipapython/ipa_log_manager.py
@@ -29,7 +29,7 @@ import sys
 import re
 import copy
 
-from log_manager import LogManager, parse_log_level
+from ipapython.log_manager import LogManager, parse_log_level
 
 #-------------------------------------------------------------------------------
 
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 4a09d3685..0b788e065 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -27,8 +27,8 @@ import time
 
 import ldap
 
-import installutils
-import service
+from ipaserver.install import installutils
+from ipaserver.install import service
 from ipaserver.install.cainstance import IPA_CA_RECORD
 from ipapython import sysrestore, ipautil, ipaldap
 from ipapython.ipa_log_manager import *
diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py
index 2036a56be..4b84eddf6 100644
--- a/ipaserver/install/dnskeysyncinstance.py
+++ b/ipaserver/install/dnskeysyncinstance.py
@@ -2,10 +2,6 @@
 # Copyright (C) 2014  FreeIPA Contributors see COPYING for license
 #
 
-from ipapython.dnsutil import DNSName
-
-import service
-import installutils
 import os
 import pwd
 import grp
@@ -14,8 +10,11 @@ import shutil
 import stat
 
 import ldap
-import _ipap11helper
 
+import _ipap11helper
+from ipapython.dnsutil import DNSName
+from ipaserver.install import service
+from ipaserver.install import installutils
 from ipapython.ipa_log_manager import *
 from ipapython.dn import DN
 from ipapython import ipaldap
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 2657e2f99..6089dd85a 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -27,12 +27,13 @@ import time
 import tempfile
 import stat
 
+import ldap
+
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, sysrestore, ipaldap
-import service
-import installutils
-import certs
-import ldap
+from ipaserver.install import service
+from ipaserver.install import installutils
+from ipaserver.install import certs
 from ipaserver.install import ldapupdate
 from ipaserver.install import replication
 from ipaserver.install import sysupgrade
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index a176acb97..196efb05e 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -27,9 +27,9 @@ import dbus
 import shlex
 import pipes
 
-import service
-import certs
-import installutils
+from ipaserver.install import service
+from ipaserver.install import certs
+from ipaserver.install import installutils
 from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython import dogtag
diff --git a/ipaserver/install/memcacheinstance.py b/ipaserver/install/memcacheinstance.py
index d4d28c38d..547ac2ba4 100644
--- a/ipaserver/install/memcacheinstance.py
+++ b/ipaserver/install/memcacheinstance.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import service
+from ipaserver.install import service
 
 class MemcacheInstance(service.SimpleServiceInstance):
     def __init__(self):
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
index 4904defb8..1fef6fd3e 100644
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import service
+from ipaserver.install import service
 from ipapython import sysrestore
 from ipapython import ipautil
 from ipaplatform.paths import paths
diff --git a/ipaserver/install/odsexporterinstance.py b/ipaserver/install/odsexporterinstance.py
index ddf2ebf36..ee5072366 100644
--- a/ipaserver/install/odsexporterinstance.py
+++ b/ipaserver/install/odsexporterinstance.py
@@ -2,14 +2,14 @@
 # Copyright (C) 2014  FreeIPA Contributors see COPYING for license
 #
 
-import service
-import installutils
 import os
 import pwd
 import grp
 
 import ldap
 
+from ipaserver.install import service
+from ipaserver.install import installutils
 from ipapython.ipa_log_manager import *
 from ipapython.dn import DN
 from ipapython import sysrestore, ipautil, ipaldap
diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py
index e8192cdc2..383de7768 100644
--- a/ipaserver/install/opendnssecinstance.py
+++ b/ipaserver/install/opendnssecinstance.py
@@ -3,19 +3,16 @@
 #
 
 import random
-
-import service
 import os
 import pwd
 import grp
 import stat
 import shutil
-
 from subprocess import CalledProcessError
 
 import _ipap11helper
-
-import installutils
+from ipaserver.install import service
+from ipaserver.install import installutils
 from ipapython.ipa_log_manager import *
 from ipapython.dn import DN
 from ipapython import sysrestore, ipautil, ipaldap, p11helper
diff --git a/ipaserver/install/otpdinstance.py b/ipaserver/install/otpdinstance.py
index 2eed3f8a2..ffb3092e9 100644
--- a/ipaserver/install/otpdinstance.py
+++ b/ipaserver/install/otpdinstance.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import service
+from ipaserver.install import service
 
 
 class OtpdInstance(service.SimpleServiceInstance):
diff --git a/ipatests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py
index 1a2f57e8a..2a44017d4 100644
--- a/ipatests/test_ipaserver/test_changepw.py
+++ b/ipatests/test_ipaserver/test_changepw.py
@@ -18,13 +18,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import nose
+import ldap
 
-from httptest import Unauthorized_HTTP_test
+from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 from ipatests.util import assert_equal, assert_not_equal
 from ipalib import api, errors
 from ipapython.dn import DN
-import ldap
 
 testuser = u'tuser'
 old_password = u'old_password'
diff --git a/ipatests/test_util.py b/ipatests/test_util.py
index f87822a22..ba72a25db 100644
--- a/ipatests/test_util.py
+++ b/ipatests/test_util.py
@@ -22,8 +22,9 @@ Test the `tests.util` module.
 """
 
 import re
-import util
-from util import raises, TYPE, VALUE, LEN, KEYS
+
+from ipatests import util
+from ipatests.util import raises, TYPE, VALUE, LEN, KEYS
 
 
 class Prop(object):
diff --git a/ipatests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index 70e3d326c..d04999a99 100644
--- a/ipatests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -22,7 +22,7 @@ Test --setattr and --addattr and other attribute-specific issues
 """
 
 from ipalib import errors
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
 user1=u'tuser1'
diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py
index 88ed33423..760964dc0 100644
--- a/ipatests/test_xmlrpc/test_automember_plugin.py
+++ b/ipatests/test_xmlrpc/test_automember_plugin.py
@@ -24,8 +24,9 @@ Test the `ipalib/plugins/automember.py` module.
 from ipalib import api, errors
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, \
-    fuzzy_automember_dn, fuzzy_automember_message
+from ipatests.test_xmlrpc.xmlrpc_test import (
+    Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_automember_dn,
+    fuzzy_automember_message)
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
 
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index d25c03f4f..952b29eec 100644
--- a/ipatests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -31,7 +31,7 @@ from ipalib import errors
 from ipapython.dn import DN
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipaplatform.paths import paths
 from ipatests.util import assert_deepequal
 
diff --git a/ipatests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py
index a2bde22e8..1cfeb53bb 100644
--- a/ipatests/test_xmlrpc/test_batch_plugin.py
+++ b/ipatests/test_xmlrpc/test_batch_plugin.py
@@ -24,7 +24,8 @@ Test the `ipalib/plugins/batch.py` module.
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.util import assert_equal, Fuzzy, assert_deepequal
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 
 group1 = u'testgroup1'
diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index 01fadfdb5..6c364763a 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -25,7 +25,7 @@ import os
 import shutil
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
 from ipalib import x509
diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py
index 6880d6139..ec31f1305 100644
--- a/ipatests/test_xmlrpc/test_config_plugin.py
+++ b/ipatests/test_xmlrpc/test_config_plugin.py
@@ -22,7 +22,8 @@ Test the `ipalib/plugins/config.py` module.
 """
 
 from ipalib import errors
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 
 class test_config(Declarative):
 
diff --git a/ipatests/test_xmlrpc/test_delegation_plugin.py b/ipatests/test_xmlrpc/test_delegation_plugin.py
index f2cfc8302..3ce7bafb4 100644
--- a/ipatests/test_xmlrpc/test_delegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_delegation_plugin.py
@@ -23,7 +23,8 @@ Test the `ipalib/plugins/delegation.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 
 delegation1 = u'testdelegation'
diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index 7e5058b09..caad00de3 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -26,7 +26,8 @@ from ipalib.util import normalize_zone
 from ipapython.dnsutil import DNSName
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 
 try:
     from ipaserver.plugins.ldap2 import ldap2
diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
index 38f3cbe79..a8c224eec 100644
--- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
+++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
@@ -27,7 +27,7 @@ from ipalib.util import normalize_zone
 from ipapython.dn import DN
 from ipapython.dnsutil import DNSName
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits
 
 
 cn = u'Realm Domains'
diff --git a/ipatests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py
index 83d4d134f..d78ee216b 100644
--- a/ipatests/test_xmlrpc/test_external_members.py
+++ b/ipatests/test_xmlrpc/test_external_members.py
@@ -25,7 +25,8 @@ import nose
 from ipalib import api
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_user_or_group_sid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
+                                              fuzzy_user_or_group_sid)
 
 group_name = u'external_group'
 group_desc = u'Test external group'
diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py
index af9e653ff..f7f619680 100644
--- a/ipatests/test_xmlrpc/test_group_plugin.py
+++ b/ipatests/test_xmlrpc/test_group_plugin.py
@@ -23,8 +23,8 @@ Test the `ipalib/plugins/group.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci,
-                         add_sid, add_oc)
+from ipatests.test_xmlrpc.xmlrpc_test import (
+    Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci, add_sid, add_oc)
 from ipapython.dn import DN
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
diff --git a/ipatests/test_xmlrpc/test_hbac_plugin.py b/ipatests/test_xmlrpc/test_hbac_plugin.py
index c0f8b5307..a9677bfde 100644
--- a/ipatests/test_xmlrpc/test_hbac_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbac_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/hbacrule.py` module.
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
 
diff --git a/ipatests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py
index 520f20247..6f7b0a615 100644
--- a/ipatests/test_xmlrpc/test_hbactest_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbactest_plugin.py
@@ -21,7 +21,7 @@
 Test the `ipalib/plugins/hbactest.py` module.
 """
 
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
 from types import NoneType
diff --git a/ipatests/test_xmlrpc/test_krbtpolicy.py b/ipatests/test_xmlrpc/test_krbtpolicy.py
index 33034f4ed..84ca17f82 100644
--- a/ipatests/test_xmlrpc/test_krbtpolicy.py
+++ b/ipatests/test_xmlrpc/test_krbtpolicy.py
@@ -21,7 +21,7 @@ Test kerberos ticket policy
 """
 
 from ipalib import api, errors
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py
index f441d2014..88ff6a18b 100644
--- a/ipatests/test_xmlrpc/test_nesting.py
+++ b/ipatests/test_xmlrpc/test_nesting.py
@@ -22,7 +22,8 @@ Test group nesting and indirect members
 
 from ipalib import api
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py
index 64cc42210..afe0c617d 100644
--- a/ipatests/test_xmlrpc/test_netgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py
@@ -27,8 +27,8 @@ import krbV
 from ipalib import api
 from ipalib import errors
 from ipaserver.plugins.ldap2 import ldap2
-from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid,
-                         fuzzy_netgroupdn)
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid, fuzzy_netgroupdn)
 from ipatests.test_xmlrpc import objectclasses
 from ipapython.dn import DN
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py
index c254bf70a..87a3e8b54 100644
--- a/ipatests/test_xmlrpc/test_old_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py
@@ -27,7 +27,8 @@ http://www.freeipa.org/page/V3/Permissions_V2
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 
 permission1 = u'testperm'
diff --git a/ipatests/test_xmlrpc/test_passwd_plugin.py b/ipatests/test_xmlrpc/test_passwd_plugin.py
index 2a44da711..916dd9e12 100644
--- a/ipatests/test_xmlrpc/test_passwd_plugin.py
+++ b/ipatests/test_xmlrpc/test_passwd_plugin.py
@@ -24,7 +24,7 @@ import sys
 
 from nose.tools import assert_raises  # pylint: disable=E0611
 
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
 
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index c899c428e..2d1a7d5e7 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -28,7 +28,7 @@ import nose
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 import inspect
 
diff --git a/ipatests/test_xmlrpc/test_ping_plugin.py b/ipatests/test_xmlrpc/test_ping_plugin.py
index 1d401993a..bdbb91e4f 100644
--- a/ipatests/test_xmlrpc/test_ping_plugin.py
+++ b/ipatests/test_xmlrpc/test_ping_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/ping.py` module, and XML-RPC in general.
 
 from ipalib import api, errors, messages, _
 from ipatests.util import Fuzzy
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.version import API_VERSION
 
 
diff --git a/ipatests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py
index 3d59c552a..9b3d50388 100644
--- a/ipatests/test_xmlrpc/test_privilege_plugin.py
+++ b/ipatests/test_xmlrpc/test_privilege_plugin.py
@@ -23,7 +23,8 @@ Test the `ipalib/plugins/privilege.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 
 permission1 = u'testperm'
diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
index 08f7cfac2..143da96fd 100644
--- a/ipatests/test_xmlrpc/test_range_plugin.py
+++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/idrange.py` module, and XML-RPC in general.
 """
 
 from ipalib import api, errors
-from xmlrpc_test import Declarative, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.util import MockLDAP
 from ipapython.dn import DN
diff --git a/ipatests/test_xmlrpc/test_realmdomains_plugin.py b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
index 703f77d1e..007891eff 100644
--- a/ipatests/test_xmlrpc/test_realmdomains_plugin.py
+++ b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/realmdomains.py` module.
 from ipalib import api, errors
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 
 
 cn = u'Realm Domains'
diff --git a/ipatests/test_xmlrpc/test_replace.py b/ipatests/test_xmlrpc/test_replace.py
index 0d02a0d8b..48444b42a 100644
--- a/ipatests/test_xmlrpc/test_replace.py
+++ b/ipatests/test_xmlrpc/test_replace.py
@@ -25,7 +25,7 @@ Note that member management in other tests also exercises the
 gen_modlist code.
 """
 
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
 user1=u'tuser1'
diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py
index 9a1c0748d..863cdb112 100644
--- a/ipatests/test_xmlrpc/test_role_plugin.py
+++ b/ipatests/test_xmlrpc/test_role_plugin.py
@@ -24,7 +24,8 @@ Test the `ipalib/plugins/role.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 
 search = u'test-role'
diff --git a/ipatests/test_xmlrpc/test_selfservice_plugin.py b/ipatests/test_xmlrpc/test_selfservice_plugin.py
index c78edbc22..1f6ebb7fb 100644
--- a/ipatests/test_xmlrpc/test_selfservice_plugin.py
+++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py
@@ -23,7 +23,8 @@ Test the `ipalib/plugins/selfservice.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 
 selfservice1 = u'testself'
 invalid_selfservice1 = u'bad+name'
diff --git a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
index c987a0c53..d67251621 100644
--- a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
+++ b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
@@ -22,7 +22,8 @@ Test the `ipalib/plugins/selinuxusermap.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+                                              fuzzy_uuid)
 from ipapython.dn import DN
 from ipatests.util import Fuzzy
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
diff --git a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py b/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
index 6ad441d16..0eb4b9853 100644
--- a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
@@ -7,7 +7,7 @@ Test the `ipalib/plugins/serviceconstraint.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 
 rule1 = u'test1'
diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index 281b0a10c..18980d777 100644
--- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -22,7 +22,8 @@ Test the `ipalib/plugins/sudocmdgroup.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_sudocmddn
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
+                                              fuzzy_sudocmddn)
 from ipapython.dn import DN
 
 sudocmdgroup1 = u'testsudocmdgroup1'
diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py
index f654a94b5..cef0f4518 100644
--- a/ipatests/test_xmlrpc/test_sudorule_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/sudorule.py` module.
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 
-from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
 from ipalib import api
 from ipalib import errors
 
diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py
index 94e4efc93..5f2de5906 100644
--- a/ipatests/test_xmlrpc/test_trust_plugin.py
+++ b/ipatests/test_xmlrpc/test_trust_plugin.py
@@ -24,8 +24,9 @@ import nose
 from ipalib import api, errors
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import (Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string,
-        fuzzy_uuid, fuzzy_digits)
+from ipatests.test_xmlrpc.xmlrpc_test import (
+    Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string, fuzzy_uuid,
+    fuzzy_digits)
 
 
 trustconfig_ad_config = DN(('cn', api.env.domain),
diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py
index 1e226d0d8..cc01eb2ee 100644
--- a/ipatests/test_xmlrpc/test_user_plugin.py
+++ b/ipatests/test_xmlrpc/test_user_plugin.py
@@ -30,9 +30,9 @@ import re
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.util import assert_equal, assert_not_equal, raises
-from xmlrpc_test import (XMLRPC_test, Declarative, fuzzy_digits, fuzzy_uuid,
-                         fuzzy_password, fuzzy_string, fuzzy_dergeneralizedtime,
-                         add_sid, add_oc)
+from ipatests.test_xmlrpc.xmlrpc_test import (
+    XMLRPC_test, Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_password,
+    fuzzy_string, fuzzy_dergeneralizedtime, add_sid, add_oc)
 from ipapython.dn import DN
 
 user1 = u'tuser1'
diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py
index 77c515413..03fb6ad02 100644
--- a/ipatests/test_xmlrpc/test_vault_plugin.py
+++ b/ipatests/test_xmlrpc/test_vault_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/vault.py` module.
 
 import nose
 from ipalib import api, errors
-from xmlrpc_test import Declarative, fuzzy_string
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_string
 
 vault_name = u'test_vault'
 service_name = u'HTTP/server.example.com'