On 01/22/2013 04:04 PM, Petr Viktorin wrote:
On 01/21/2013 06:38 PM, Petr Viktorin wrote:
On 01/17/2013 06:27 PM, Petr Viktorin wrote:
Hello,
This is the first batch of changes aimed to consolidate our LDAP code.
Each should be a self-contained change that doesn't break anything.
These patches do some general cleanup (some of the changes might seem
trivial but help a lot when grepping through the code); merge the common
parts LDAPEntry, Entry and Entity classes; and move stuff that depends
on an installed server out of IPASimpleLDAPObject and SchemaCache.
I'm posting them early so you can see where I'm going, and so you can
find out if your work will conflict with mine.
Patch 0120 grew a conflict with master, attaching a rebased version.
--
Petr³
From 62e333f4e8fde966c962a46220bd911ac62d23e9 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Thu, 10 Jan 2013 06:14:15 -0500
Subject: [PATCH] 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 1f359062b49eed400aaa7b6aeea4742253707b00..0fb44a0e151f24b12451ef5c6942b71e4ea372bd 100644
--- a/install/restart_scripts/renew_ra_cert
+++ b/install/restart_scripts/renew_ra_cert
@@ -34,7 +34,6 @@ from ipapython.dn import DN
from ipalib import x509
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 83c6b8f4f843e6e389a28b9b4527f89a5e7a118d..11bb2d36791ed86b132ea83068240bb9b797b2b2 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -21,16 +21,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from ipaserver.plugins.ldap2 import ldap2
from ipaserver.install import adtrustinstance
from ipaserver.install.installutils import *
from ipaserver.install import service
from ipapython import version
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 71592d4899d702606b33e0ac89592d91f99c5e29..83ca0782f3d4c10146e10beaec185dd126633002 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -19,7 +19,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-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 e68d4d36094d97f63213a0e4475b5a999475200f..186a816ac83b7ef6941186271e448dd7379871cc 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 53c0053c66ec301e40be605f84c87ddc388450a2..c911da18846e6b313387856f6652614d5092ede3 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 0fe3e04e3dead336a9559468db62a60044e965da..44751e1b095e078cb1fc4727288d196177e76860 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -21,16 +21,14 @@ Base classes for LDAP plugins.
"""
import re
-import json
import time
from copy import deepcopy
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 76ef68726527e25d9b097c79f298692380cdaeb2..b160f4517958879d8c302e1fd25e85c7bd52398e 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 daacab5d79830beb2b4dd65fde830e2be0898416..d783da0ab86e5c2edb3e607bd922ac57dafa1b0a 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 4854410897a760f7cf3803d4308af7af82122e64..f08ee8b9e1f844c92e56f30b550ce244d08f7877 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 dca2c75ddcebb37d09d356daa8be9a0f1be78812..711ed050741f21a4862c555cf908d1dd5f643b15 100644
--- a/ipaserver/install/plugins/updateclient.py
+++ b/ipaserver/install/plugins/updateclient.py
@@ -17,16 +17,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-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 1c90173d22993ada06499ec4abcebd96c3cb955b..fdd5c0b4dc5c210e62e91c292b7a56766eb22864 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 c7e1552e6f61721ee8f96b4b4b0dfbaaec0106e0..b7b8bc1837135ffe1925efd1f317e5b551fb3496 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 d52bb7e980f1158dc2c6329c4127d3b7b8bfcca2..2a74fc626e12c63f417e483262110c92943e8168 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -1202,9 +1202,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 ff43ddb4b22347815ad78d720c476588c6f8b84a..06ea46997be96dec6fff9512a8d47e9bea5eeef2 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 76a99b7d7c8a8341f01bcc1ea79a369127c6defc..1df6a7cce759224a20270da5f16069fc28559e38 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
--
1.7.7.6
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
