diff options
Diffstat (limited to 'ipaserver/install')
25 files changed, 7 insertions, 52 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 8daca552d..d679bbc89 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -41,7 +41,6 @@ from ipalib import api, errors from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths -from ipaplatform.tasks import tasks from ipalib.util import (validate_zonemgr_str, normalize_zonemgr, get_dns_forward_zone_update_policy, get_dns_reverse_zone_update_policy, diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py index 36a7d57b9..8420a8ddf 100644 --- a/ipaserver/install/ca.py +++ b/ipaserver/install/ca.py @@ -5,7 +5,6 @@ from __future__ import print_function import sys -import os.path from ipaserver.install import cainstance, dsinstance, bindinstance from ipapython import ipautil, certdb diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 736af7c38..f3c1bfa36 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -31,7 +31,6 @@ import pwd import re import shutil import stat -import subprocess import sys import syslog import time diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index b5b551a60..1591362b4 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -42,7 +42,6 @@ from ipapython.dn import DN from ipalib import pkcs10, x509, api from ipalib.errors import CertificateOperationError from ipalib.text import _ -from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index bdbe2e38b..6c00c3482 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -39,7 +39,6 @@ from dns import resolver, rdatatype from dns.exception import DNSException import ldap import ldapurl -from nss.error import NSPRError import six from six.moves.configparser import SafeConfigParser, NoOptionError @@ -47,7 +46,7 @@ import ipaplatform from ipapython import ipautil, sysrestore, admintool, version from ipapython.admintool import ScriptError -from ipapython.ipa_log_manager import root_logger, log_mgr +from ipapython.ipa_log_manager import root_logger from ipalib.util import validate_hostname from ipapython import config from ipalib import api, errors, x509 @@ -56,8 +55,6 @@ from ipaserver.install import certs, service, sysupgrade from ipaplatform import services from ipaplatform.paths import paths from ipaplatform.tasks import tasks -from ipapython import certmonger - if six.PY3: unicode = str diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py index 8e9b258bf..d49576d7d 100644 --- a/ipaserver/install/ipa_backup.py +++ b/ipaserver/install/ipa_backup.py @@ -18,12 +18,10 @@ # import os -import sys import shutil import tempfile import time import pwd -from optparse import OptionGroup from ipaplatform.paths import paths from ipaplatform import services @@ -33,7 +31,6 @@ from ipalib import api, errors from ipapython import version from ipapython.ipautil import run, write_tmp_file from ipapython import admintool -from ipapython.config import IPAOptionParser from ipapython.dn import DN from ipaserver.install.dsinstance import DS_USER from ipaserver.install.replication import wait_for_task diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py index 110feb2cc..2a4e8efc1 100644 --- a/ipaserver/install/ipa_cacert_manage.py +++ b/ipaserver/install/ipa_cacert_manage.py @@ -20,9 +20,7 @@ from __future__ import print_function import os -import time from optparse import OptionGroup -import base64 from nss import nss from nss.error import NSPRError import gssapi @@ -32,7 +30,6 @@ from ipapython.dn import DN from ipaplatform.paths import paths from ipalib import api, errors, x509, certstore from ipaserver.install import certs, cainstance, installutils -from ipaserver.plugins.ldap2 import ldap2 class CACertManage(admintool.AdminTool): diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py index 643ad4031..33c1072db 100644 --- a/ipaserver/install/ipa_kra_install.py +++ b/ipaserver/install/ipa_kra_install.py @@ -25,7 +25,6 @@ import tempfile from textwrap import dedent from ipalib import api from ipalib.constants import DOMAIN_LEVEL_0 -from ipaplatform import services from ipaplatform.paths import paths from ipapython import admintool from ipapython import ipautil diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index 90c09c48f..2f91a830f 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -31,9 +31,9 @@ import sys import six from ipalib import api -from ipapython import ipautil, admintool +from ipapython import admintool from ipaplatform.paths import paths -from ipaserver.install import installutils, dsinstance, schemaupdate +from ipaserver.install import installutils, schemaupdate from ipaserver.install.ldapupdate import LDAPUpdate, UPDATES_DIR, BadSyntax from ipaserver.install.upgradeinstance import IPAUpgrade diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py index 10b8af6f1..8ea67fce1 100644 --- a/ipaserver/install/ipa_otptoken_import.py +++ b/ipaserver/install/ipa_otptoken_import.py @@ -36,7 +36,7 @@ from six.moves import xrange from ipapython import admintool from ipalib import api, errors -from ipaserver.plugins.ldap2 import ldap2, AUTOBIND_DISABLED +from ipaserver.plugins.ldap2 import AUTOBIND_DISABLED if six.PY3: unicode = str diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index dd8de209a..b223bd287 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -18,17 +18,14 @@ # import os -import sys import shutil import tempfile import time import pwd import ldif import itertools -import locale from six.moves.configparser import SafeConfigParser -import six from ipalib import api, errors, constants from ipapython import version, ipautil, certdb diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py index ac0b0274e..a7af319c6 100644 --- a/ipaserver/install/ipa_server_certinstall.py +++ b/ipaserver/install/ipa_server_certinstall.py @@ -18,7 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import sys import os import os.path import pwd @@ -28,10 +27,9 @@ from ipaplatform.constants import constants from ipaplatform.paths import paths from ipapython import admintool from ipapython.dn import DN -from ipapython.ipautil import user_input, write_tmp_file from ipalib import api, errors from ipalib.constants import CACERT -from ipaserver.install import certs, dsinstance, httpinstance, installutils +from ipaserver.install import certs, dsinstance, installutils class ServerCertInstall(admintool.AdminTool): diff --git a/ipaserver/install/ipa_server_upgrade.py b/ipaserver/install/ipa_server_upgrade.py index 2ebdf9185..c38470474 100644 --- a/ipaserver/install/ipa_server_upgrade.py +++ b/ipaserver/install/ipa_server_upgrade.py @@ -2,8 +2,6 @@ # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # -import os - from ipalib import api from ipaplatform.paths import paths from ipapython import admintool diff --git a/ipaserver/install/ipa_winsync_migrate.py b/ipaserver/install/ipa_winsync_migrate.py index bbd029c81..bf4f7be6b 100644 --- a/ipaserver/install/ipa_winsync_migrate.py +++ b/ipaserver/install/ipa_winsync_migrate.py @@ -27,8 +27,6 @@ from ipalib import errors from ipapython import admintool from ipapython.dn import DN from ipapython.ipautil import realm_to_suffix, posixify -from ipapython.ipa_log_manager import log_mgr -from ipaserver.plugins.ldap2 import ldap2 from ipaserver.install import replication, installutils if six.PY3: diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 20de71de0..1118ddafb 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -21,9 +21,6 @@ from __future__ import absolute_import from __future__ import print_function import shutil -import fileinput -import re -import sys import os import pwd import socket @@ -34,7 +31,6 @@ from ipaserver.install import installutils from ipapython import sysrestore from ipapython import ipautil from ipapython import kernel_keyring -from ipalib import errors from ipalib.constants import CACERT from ipapython.ipa_log_manager import * from ipapython.dn import DN @@ -43,9 +39,6 @@ from ipaserver.install import replication from ipaserver.install import dsinstance from ipaserver.install import ldapupdate -import pyasn1.codec.ber.decoder -import struct - from ipaserver.install import certs from distutils import version from ipaplatform.tasks import tasks diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 2ed5e8f4e..528e52bbd 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -30,7 +30,6 @@ import time import os import pwd import fnmatch -import re import ldap diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py index 533d53afa..357908fb4 100644 --- a/ipaserver/install/opendnssecinstance.py +++ b/ipaserver/install/opendnssecinstance.py @@ -2,7 +2,6 @@ # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # -import random import os import pwd import grp diff --git a/ipaserver/install/plugins/adtrust.py b/ipaserver/install/plugins/adtrust.py index 5510dfd36..d96bfe83e 100644 --- a/ipaserver/install/plugins/adtrust.py +++ b/ipaserver/install/plugins/adtrust.py @@ -19,11 +19,8 @@ from ipalib import api, errors from ipalib import Updater -from ipaplatform.paths import paths from ipapython.dn import DN from ipapython.ipa_log_manager import * -from ipapython import sysrestore -from ipaserver.install import installutils DEFAULT_ID_RANGE_SIZE = 200000 diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index 6d7c81c98..646ed23f3 100644 --- a/ipaserver/install/plugins/dns.py +++ b/ipaserver/install/plugins/dns.py @@ -17,7 +17,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/>. -import ldap as _ldap import re import traceback import time diff --git a/ipaserver/install/plugins/fix_replica_agreements.py b/ipaserver/install/plugins/fix_replica_agreements.py index 106f66a45..00f2415d4 100644 --- a/ipaserver/install/plugins/fix_replica_agreements.py +++ b/ipaserver/install/plugins/fix_replica_agreements.py @@ -17,9 +17,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/>. -import os -import pwd -from ipapython import ipaldap from ipaserver.install import replication from ipalib import api from ipalib import Updater diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index 00b05c9b3..637e56643 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -11,7 +11,6 @@ from ipapython.install.core import Knob from ipalib.util import validate_domain_name from ipaserver.install import bindinstance from ipapython.ipautil import check_zone_overlap -from ipapython.dnsutil import DNSName VALID_SUBJECT_ATTRS = ['st', 'o', 'ou', 'dnqualifier', 'c', 'serialnumber', 'l', 'title', 'sn', 'givenname', diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 831985d61..8a57886cd 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -17,7 +17,7 @@ import six from ipapython import certmonger, ipaldap, ipautil, sysrestore from ipapython.dn import DN -from ipapython.install import common, core +from ipapython.install import core from ipapython.install.common import step from ipapython.install.core import Knob from ipapython.ipa_log_manager import root_logger diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 63fe02b5c..78e32ae9b 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -15,9 +15,8 @@ import socket import sys import tempfile -from ipapython import certmonger, ipaldap, ipautil, sysrestore +from ipapython import ipaldap, ipautil, sysrestore from ipapython.dn import DN -from ipapython.install import common, core from ipapython.install.common import step from ipapython.install.core import Knob from ipapython.ipa_log_manager import root_logger diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index a2f40ef38..2f2e29ee8 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -20,7 +20,6 @@ import sys import os, socket import tempfile -import time import datetime import traceback diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 602e6ec49..12737ed11 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -18,15 +18,12 @@ # import ldif -import os -import sys import shutil import random import traceback from ipaplatform.paths import paths from ipaplatform import services from ipapython.ipa_log_manager import * -from ipapython import ipaldap from ipaserver.install import installutils from ipaserver.install import schemaupdate |