ldap: Remove IPASimpleLDAPObject

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

1 files changed, 0 insertions, 105 deletions

diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 5bf4aa603..7cda7d67d 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -187,111 +187,6 @@ class SchemaCache(object):
 schema_cache = SchemaCache()
 
 
-class IPASimpleLDAPObject(object):
-    '''
-    IPA code should never call python-ldap directly, it should only
-    call python-ldap methods in this class.
-    '''
-
-    def __init__(self, uri):
-        """An internal LDAP connection object
-
-        :param uri: The LDAP URI to connect to
-        """
-        self.log = log_mgr.get_logger(self)
-        self.uri = uri
-        self.conn = SimpleLDAPObject(uri)
-
-    #---------- python-ldap emulations ----------
-
-    def add(self, dn, modlist):
-        return self.conn.add(dn, modlist)
-
-    def add_ext(self, dn, modlist, serverctrls=None, clientctrls=None):
-        return self.conn.add_ext(dn, modlist, serverctrls, clientctrls)
-
-    def add_ext_s(self, dn, modlist, serverctrls=None, clientctrls=None):
-        return self.conn.add_ext_s(dn, modlist, serverctrls, clientctrls)
-
-    def add_s(self, dn, modlist):
-        return self.conn.add_s(dn, modlist)
-
-    def bind(self, who, cred, method=ldap.AUTH_SIMPLE):
-        return self.conn.bind(who, cred, method)
-
-    def delete(self, dn):
-        return self.conn.delete(dn)
-
-    def delete_s(self, dn):
-        return self.conn.delete_s(dn)
-
-    def get_option(self, option):
-        return self.conn.get_option(option)
-
-    def modify_s(self, dn, modlist):
-        return self.conn.modify_s(dn, modlist)
-
-    def modrdn_s(self, dn, newrdn, delold=1):
-        return self.conn.modrdn_s(dn, newrdn, delold)
-
-    def passwd_s(self, dn, oldpw, newpw, serverctrls=None, clientctrls=None):
-        return self.conn.passwd_s(dn, oldpw, newpw, serverctrls, clientctrls)
-
-    def rename_s(self, dn, newrdn, newsuperior=None, delold=1):
-        # NOTICE: python-ldap of version 2.3.10 and lower does not support
-        # serverctrls and clientctrls for rename_s operation. Thus, these
-        # options are ommited from this command until really needed
-        return self.conn.rename_s(dn, newrdn, newsuperior, delold)
-
-    def result(self, msgid=ldap.RES_ANY, all=1, timeout=None):
-        return self.conn.result(msgid, all, timeout)
-
-    def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None):
-        return self.conn.result3(msgid, all, timeout)
-
-    def sasl_interactive_bind_s(self, who, auth, serverctrls=None,
-                                clientctrls=None, sasl_flags=ldap.SASL_QUIET):
-        return self.conn.sasl_interactive_bind_s(who, auth, serverctrls,
-                                                 clientctrls, sasl_flags)
-
-    def search(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0):
-        return self.conn.search(base, scope, filterstr, attrlist, attrsonly)
-
-    def search_ext(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0, serverctrls=None, clientctrls=None, timeout=-1, sizelimit=0):
-        if _debug_log_ldap:
-            self.log.debug(
-                "ldap.search_ext: dn: %s\nfilter: %s\nattrs_list: %s",
-                base, filterstr, attrlist)
-
-
-        return self.conn.search_ext(base, scope, filterstr, attrlist, attrsonly, serverctrls, clientctrls, timeout, sizelimit)
-
-    def search_ext_s(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0, serverctrls=None, clientctrls=None, timeout=-1, sizelimit=0):
-        return self.conn.search_ext_s(base, scope, filterstr, attrlist,
-                                      attrsonly, serverctrls, clientctrls,
-                                      timeout, sizelimit)
-
-    def search_s(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0):
-        return self.conn.search_s(base, scope, filterstr, attrlist,
-                                  attrsonly)
-
-    def search_st(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0, timeout=-1):
-        return self.conn.search_st(base, scope, filterstr, attrlist, attrsonly,
-                                   timeout)
-
-    def set_option(self, option, invalue):
-        return self.conn.set_option(option, invalue)
-
-    def simple_bind_s(self, who=None, cred='', serverctrls=None, clientctrls=None):
-        return self.conn.simple_bind_s(who, cred, serverctrls, clientctrls)
-
-    def start_tls_s(self):
-        return self.conn.start_tls_s()
-
-    def unbind_s(self):
-        return self.conn.unbind_s()
-
-
 class LDAPEntry(collections.MutableMapping):
     __slots__ = ('_conn', '_dn', '_names', '_nice', '_raw', '_sync',
                  '_not_list', '_orig', '_raw_view', '_single_value_view')