ipaplatform: Remove redundant imports of ipaservices

Also fixes few incorrect imports.

https://fedorahosted.org/freeipa/ticket/4052

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

11 files changed, 5 insertions, 16 deletions

diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 170feac46..59a383e2e 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -37,7 +37,6 @@ from ipapython.dn import DN
 from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython.ipa_log_manager import *
-from ipapython import services as ipaservices
 
 import ipaclient.ipachangeconf
 from ipaplatform import services
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 599bfffc8..b9c786be9 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -49,9 +49,8 @@ import subprocess
 import traceback
 
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import ipaldap
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaserver.install import service
 from ipaserver.install import installutils
 from ipaserver.install import dsinstance
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index c5380e939..a005fb9f7 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -37,7 +37,6 @@ from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython import certmonger
 from ipapython.certdb import get_ca_nickname
-from ipapython import services as ipaservices
 from ipapython.dn import DN
 from ipalib import pkcs10, x509, api
 from ipalib.errors import CertificateOperationError
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 1186edadb..c1b2ba62a 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -31,7 +31,6 @@ import grp
 
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, sysrestore, ipaldap
-from ipapython import services as ipaservices
 import service
 import installutils
 import certs
@@ -40,7 +39,7 @@ from ipaserver.install import ldapupdate
 from ipaserver.install import replication
 from ipaserver.install import sysupgrade
 from ipalib import errors
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipalib.constants import CACERT
 from ipapython.dn import DN
 from ipaplatform import services
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 979d7ff98..2709356be 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -30,12 +30,11 @@ import certs
 import installutils
 from ipapython import sysrestore
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import dogtag
 from ipapython.ipa_log_manager import *
 from ipaserver.install import sysupgrade
 from ipalib import api
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipalib.constants import CACERT
 
 HTTPD_DIR = "/etc/httpd"
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index a2de7c1bd..48c347e04 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -42,7 +42,6 @@ from ipapython import config
 from ipalib import errors
 from ipapython.dn import DN
 from ipaserver.install import certs, service
-from ipapython import services as ipaservices
 from ipaplatform import services
 
 # Used to determine install status
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index d3f7f178d..e704c1cb8 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -36,7 +36,6 @@ from ipapython.dn import DN
 from ipaserver.install.dsinstance import realm_to_serverid, DS_USER
 from ipaserver.install.replication import wait_for_task
 from ipaserver.install import installutils
-from ipapython import services as ipaservices
 from ipapython import ipaldap
 from ipalib.session import ISO8601_DATETIME_FMT
 from ipalib.constants import CACERT
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index d2064d4af..bf9b95a84 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -36,9 +36,8 @@ from ipaserver.install.cainstance import PKI_USER
 from ipaserver.install.replication import (wait_for_task, ReplicationManager,
                                            get_cs_replication_manager)
 from ipaserver.install import installutils
-from ipapython import services as ipaservices
 from ipapython import ipaldap
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 from ipaserver.install.ipa_backup import BACKUP_DIR
 from ipaplatform import services
 
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 9475491e7..cbb54236e 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -30,7 +30,6 @@ import service
 import installutils
 from ipapython import sysrestore
 from ipapython import ipautil
-from ipapython import services as ipaservices
 from ipapython import kernel_keyring
 from ipalib import errors
 from ipalib.constants import CACERT
@@ -45,7 +44,7 @@ import struct
 
 import certs
 from distutils import version
-from ipaplatform import tasks
+from ipaplatform.tasks import tasks
 
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 4a484d617..dd12c0d1d 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -26,7 +26,6 @@ import ldap
 
 from ipalib import api, errors
 from ipalib.constants import CACERT
-from ipapython import services as ipaservices
 from ipapython.ipa_log_manager import *
 from ipapython import ipautil, dogtag, ipaldap
 from ipapython.dn import DN
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 3a6983856..6108a2b2a 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -25,7 +25,6 @@ import time
 import datetime
 
 from ipapython import sysrestore, ipautil, dogtag, ipaldap
-from ipapython import services as ipaservices
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import *
 from ipalib import errors