From c0a89efd6852bfd07dec4c8b1e74f0e927e7fdd8 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 10 Jan 2013 06:14:15 -0500 Subject: Remove some unused imports Remove all unused LDAP-related imports, plus some other ones. This should make it easier to quickly check what uses which LDAP wrapper --- install/restart_scripts/renew_ra_cert | 1 - install/tools/ipa-adtrust-install | 2 -- install/tools/ipa-dns-install | 1 - install/tools/ipa-managed-entries | 1 - ipalib/aci.py | 1 - ipalib/plugins/baseldap.py | 4 +--- ipaserver/install/dsinstance.py | 5 +---- ipaserver/install/krbinstance.py | 4 ---- ipaserver/install/ldapupdate.py | 26 ++++++++++++-------------- ipaserver/install/plugins/updateclient.py | 4 ---- ipaserver/install/replication.py | 9 ++++----- ipaserver/ipaldap.py | 1 - ipaserver/plugins/dogtag.py | 4 ++-- ipaserver/plugins/ldap2.py | 3 --- tests/test_cmdline/cmdline.py | 4 ++-- 15 files changed, 22 insertions(+), 48 deletions(-) diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert index a70ba5c1a..e5418fdaf 100644 --- a/install/restart_scripts/renew_ra_cert +++ b/install/restart_scripts/renew_ra_cert @@ -32,7 +32,6 @@ from ipalib import api from ipapython.dn import DN from ipalib import errors from ipaserver.plugins.ldap2 import ldap2 -import ldap as _ldap api.bootstrap(context='restart') api.finalize() diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index 00b64700d..ea8d4e467 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -21,7 +21,6 @@ # along with this program. If not, see . # -from ipaserver.plugins.ldap2 import ldap2 from ipaserver.install import adtrustinstance from ipaserver.install.installutils import * from ipaserver.install import service @@ -30,7 +29,6 @@ from ipapython import ipautil, sysrestore from ipalib import api, errors, util from ipapython.config import IPAOptionParser import krbV -import ldap from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 2ab90b648..4918b95df 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -19,7 +19,6 @@ # along with this program. If not, see . # -from ipaserver.plugins.ldap2 import ldap2 from ipaserver.install import service, bindinstance, ntpinstance, httpinstance from ipaserver.install.installutils import * from ipaserver.install import installutils diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index e68d4d360..186a816ac 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -26,7 +26,6 @@ try: from ipapython import ipautil, config from ipaserver.install import installutils from ipaserver import ipaldap - from ipaserver.plugins.ldap2 import ldap2 from ipalib import api, errors from ipapython.ipa_log_manager import * from ipapython.dn import DN diff --git a/ipalib/aci.py b/ipalib/aci.py index 53c0053c6..c911da188 100755 --- a/ipalib/aci.py +++ b/ipalib/aci.py @@ -19,7 +19,6 @@ import shlex import re -import ldap # The Python re module doesn't do nested parenthesis diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 2cde65f1e..b34c92e6d 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -21,7 +21,6 @@ Base classes for LDAP plugins. """ import re -import json import time from copy import deepcopy import base64 @@ -29,8 +28,7 @@ import base64 from ipalib import api, crud, errors from ipalib import Method, Object, Command from ipalib import Flag, Int, Str -from ipalib.base import NameSpace -from ipalib.cli import to_cli, from_cli +from ipalib.cli import to_cli from ipalib import output from ipalib.text import _ from ipalib.util import json_serialize, validate_hostname diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 367496f18..4689fd2bf 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -21,7 +21,6 @@ import shutil from ipapython.ipa_log_manager import * import pwd -import glob import sys import os import re @@ -39,11 +38,9 @@ import certs import ldap from ipaserver import ipaldap from ipaserver.install import ldapupdate -from ipaserver.install import httpinstance from ipaserver.install import replication -from ipalib import util, errors +from ipalib import errors from ipapython.dn import DN -from ipaserver.plugins.ldap2 import ldap2 import base64 SERVER_ROOT_64 = "/usr/lib64/dirsrv" diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index daacab5d7..d783da0ab 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -30,7 +30,6 @@ import installutils from ipapython import sysrestore from ipapython import ipautil from ipapython import services as ipaservices -from ipalib import util from ipalib import errors from ipapython.ipa_log_manager import * from ipapython.dn import DN @@ -41,10 +40,7 @@ from ipaserver.install import dsinstance import ldap from ldap import LDAPError -from ldap import ldapobject -from pyasn1.type import univ, namedtype -import pyasn1.codec.ber.encoder import pyasn1.codec.ber.decoder import struct diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 485441089..f08ee8b9e 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -25,29 +25,27 @@ UPDATES_DIR="/usr/share/ipa/updates/" import sys -from ipaserver.install import installutils -from ipaserver.install import service -from ipaserver import ipaldap -from ipapython import entity, ipautil import uuid -from ipalib import util -from ipalib import errors -from ipalib import api -from ipapython.dn import DN -import ldap -from ldap.schema.models import ObjectClass, AttributeType -from ipapython.ipa_log_manager import * -import krbV import platform import time -import random import os import pwd import fnmatch import csv import inspect + +import krbV +import ldap +from ldap.schema.models import ObjectClass, AttributeType + +from ipaserver.install import installutils +from ipaserver import ipaldap +from ipapython import entity, ipautil +from ipalib import errors +from ipalib import api +from ipapython.dn import DN +from ipapython.ipa_log_manager import * from ipaserver.install.plugins import PRE_UPDATE, POST_UPDATE -from ipaserver.install.plugins import FIRST, MIDDLE, LAST class BadSyntax(installutils.ScriptError): def __init__(self, value): diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py index 7da583fd8..a4bc79238 100644 --- a/ipaserver/install/plugins/updateclient.py +++ b/ipaserver/install/plugins/updateclient.py @@ -17,16 +17,12 @@ # along with this program. If not, see . # -import os -from ipaserver.install.plugins import FIRST, MIDDLE, LAST -from ipaserver.install.plugins import POST_UPDATE from ipaserver.install.plugins.baseupdate import DSRestart from ipaserver.install.ldapupdate import LDAPUpdate from ipapython.ipautil import wait_for_open_socket from ipalib import api from ipalib import backend from ipapython.dn import DN -import ldap as _ldap class updateclient(backend.Executioner): """ diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 1c90173d2..fdd5c0b4d 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -18,15 +18,14 @@ # import time -from ipapython.ipa_log_manager import * - -import os import sys + import ldap + from ipaserver import ipaldap +from ipalib import api, errors from ipapython import services as ipaservices -from ldap import modlist -from ipalib import api, util, errors +from ipapython.ipa_log_manager import * from ipapython import ipautil, dogtag from ipapython.dn import DN diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index c7e1552e6..b7b8bc183 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -33,7 +33,6 @@ import struct import ldap.sasl import ldapurl from ldap.controls import LDAPControl -from ldap.ldapobject import SimpleLDAPObject from ipapython.ipa_log_manager import * from ipapython import ipautil from ipalib import errors diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 28bf754cb..343368c99 100644 --- a/ipaserver/plugins/dogtag.py +++ b/ipaserver/plugins/dogtag.py @@ -1207,9 +1207,9 @@ from ipalib import api, SkipPluginModule if api.env.ra_plugin != 'dogtag': # In this case, abort loading this plugin module... raise SkipPluginModule(reason='dogtag not selected as RA plugin') -import os, random, ldap +import os, random from ipaserver.plugins import rabase -from ipalib.errors import NetworkError, CertificateOperationError +from ipalib.errors import CertificateOperationError from ipalib.constants import TYPE_ERROR from ipalib.util import cachedproperty from ipapython import dogtag diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 86ea5d479..fa2935177 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -29,14 +29,11 @@ Backend plugin for LDAP. import copy import os -import socket -import string import shutil import tempfile import time import re import pwd -import sys from decimal import Decimal import krbV diff --git a/tests/test_cmdline/cmdline.py b/tests/test_cmdline/cmdline.py index 76a99b7d7..1df6a7cce 100644 --- a/tests/test_cmdline/cmdline.py +++ b/tests/test_cmdline/cmdline.py @@ -22,9 +22,9 @@ Base class for all cmdline tests """ import nose -import ldap import krbV -from ipalib import api, request + +from ipalib import api from ipalib import errors from tests.test_xmlrpc.xmlrpc_test import XMLRPC_test from ipaserver.plugins.ldap2 import ldap2 -- cgit