Remove unused methods from Entry, Entity, and IPAdmin

These classes are deprecated, there's no use keeping unused methods around.

Part of the work for: https://fedorahosted.org/freeipa/ticket/2660

2 files changed, 0 insertions, 160 deletions

diff --git a/ipapython/entity.py b/ipapython/entity.py
index c15a3c093..7faa46de9 100644
--- a/ipapython/entity.py
+++ b/ipapython/entity.py
@@ -72,10 +72,6 @@ class Entity:
         true otherwise"""
         return self.data != None and len(self.data) > 0
 
-    def hasAttr(self,name):
-        """Return True if this entry has an attribute named name, False otherwise"""
-        return self.data and self.data.has_key(name)
-
     def __str__(self):
         return "dn: %s data: %s" % (self.dn, self.data)
 
@@ -109,32 +105,6 @@ class Entity:
 
     setValues = setValue
 
-    def setValueNotEmpty(self,name,*value):
-        """Similar to setValue() but will not set an empty field. This
-           is an attempt to avoid adding empty attributes."""
-        if (len(value) >= 1) and value[0] and len(value[0]) > 0:
-            if isinstance(value[0], list):
-                if len(value[0][0]) > 0:
-                    self.setValue(name, *value)
-                    return
-            else:
-                self.setValue(name, *value)
-                return
-
-        # At this point we have an empty incoming value. See if they are
-        # trying to erase the current value. If so we'll delete it so
-        # it gets marked as removed in the modlist.
-        v = self.getValues(name)
-        if v:
-            self.delValue(name)
-
-        return
-
-    def delValue(self,name):
-        """Remove the attribute named name."""
-        if self.data.get(name,None):
-            del self.data[name]
-
     def toTupleList(self):
         """Convert the attrs and values to a list of 2-tuples.  The first element
         of the tuple is the attribute name.  The second element is either a
@@ -159,25 +129,3 @@ class Entity:
         result = ipautil.CIDict(self.orig_data)
         result['dn'] = self.dn
         return result
-
-#    def __str__(self):
-#        """Convert the Entry to its LDIF representation"""
-#        return self.__repr__()
-#
-#    # the ldif class base64 encodes some attrs which I would rather see in raw form - to
-#    # encode specific attrs as base64, add them to the list below
-#    ldif.safe_string_re = re.compile('^$')
-#    base64_attrs = ['nsstate', 'krbprincipalkey', 'krbExtraData']
-#
-#    def __repr__(self):
-#        """Convert the Entry to its LDIF representation"""
-#        sio = cStringIO.StringIO()
-#        # what's all this then?  the unparse method will currently only accept
-#        # a list or a dict, not a class derived from them.  self.data is a
-#        # cidict, so unparse barfs on it.  I've filed a bug against python-ldap,
-#        # but in the meantime, we have to convert to a plain old dict for printing
-#        # I also don't want to see wrapping, so set the line width really high (1000)
-#        newdata = {}
-#        newdata.update(self.data)
-#        ldif.LDIFWriter(sio,User.base64_attrs,1000).unparse(self.dn,newdata)
-#        return sio.getvalue()
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index b7b8bc183..f44c48421 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -128,10 +128,6 @@ class Entry:
         true otherwise"""
         return self.data != None and len(self.data) > 0
 
-    def hasAttr(self,name):
-        """Return True if this entry has an attribute named name, False otherwise"""
-        return self.data and self.data.has_key(name)
-
     def getValues(self,name):
         """Get the list (array) of values for the attribute named name"""
         return self.data.get(name)
@@ -165,13 +161,6 @@ class Entry:
 
     setValues = setValue
 
-    def delAttr(self, name):
-        """
-        Entirely remove an attribute of this entry.
-        """
-        if self.hasAttr(name):
-            del self.data[name]
-
     def toTupleList(self):
         """Convert the attrs and values to a list of 2-tuples.  The first element
         of the tuple is the attribute name.  The second element is either a
@@ -381,22 +370,6 @@ class IPAdmin(IPAEntryLDAPObject):
                 raise e
             bind_func(*args, **kwargs)
 
-    def toLDAPURL(self):
-        return "ldap://%s/" % format_netloc(self.host, self.port)
-
-    def set_proxydn(self, proxydn):
-        self.proxydn = proxydn
-
-    def set_krbccache(self, krbccache, principal):
-        try:
-            if krbccache is not None:
-                os.environ["KRB5CCNAME"] = krbccache
-                self.sasl_interactive_bind_s(None, SASL_AUTH)
-                self.principal = principal
-            self.proxydn = None
-        except ldap.LDAPError, e:
-            self.__handle_errors(e)
-
     def do_simple_bind(self, binddn=DN(('cn', 'directory manager')), bindpw="", timeout=DEFAULT_TIMEOUT):
         self.binddn = binddn    # FIXME, self.binddn & self.bindpwd never referenced.
         self.bindpwd = bindpw
@@ -460,49 +433,6 @@ class IPAdmin(IPAEntryLDAPObject):
 
         return entries
 
-    def getListAsync(self, base, scope, filterstr='(objectClass=*)', attrlist=None, attrsonly=0,
-                     serverctrls=None, clientctrls=None, timeout=-1, sizelimit=0):
-        """This version performs an asynchronous search, to allow
-           results even if we hit a limit.
-
-           It returns a list: counter followed by the results.
-           If the results are truncated, counter will be set to -1.
-           """
-
-        sctrl = self.__get_server_controls()
-        if sctrl is not None:
-            self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
-
-        entries = []
-        partial = 0
-
-        try:
-            msgid = self.search_ext(base, scope, filterstr, attrlist, attrsonly,
-                                    serverctrls, clientctrls, timeout, sizelimit)
-            objtype, result_list = self.result(msgid, 0)
-            while result_list:
-                for result in result_list:
-                    entries.append(result)
-                objtype, result_list = self.result(msgid, 0)
-        except (ldap.ADMINLIMIT_EXCEEDED, ldap.SIZELIMIT_EXCEEDED,
-                ldap.TIMELIMIT_EXCEEDED), e:
-            partial = 1
-        except ldap.LDAPError, e:
-            arg_desc = 'base="%s", scope=%s, filterstr="%s", timeout=%s, sizelimit=%s' % \
-                       (base, scope, filterstr, timeout, sizelimit)
-            self.__handle_errors(e, arg_desc=arg_desc)
-
-        if not entries:
-            arg_desc = 'base="%s", scope=%s, filterstr="%s"' % (base, scope, filterstr)
-            raise errors.NotFound(reason=arg_desc)
-
-        if partial == 1:
-            counter = -1
-        else:
-            counter = len(entries)
-
-        return [counter] + entries
-
     def addEntry(self, entry):
         """This wraps the add function. It assumes that the entry is already
            populated with all of the desired objectclasses and attributes"""
@@ -521,25 +451,6 @@ class IPAdmin(IPAEntryLDAPObject):
             self.__handle_errors(e, arg_desc=arg_desc)
         return True
 
-    def updateRDN(self, dn, newrdn):
-        """Wrap the modrdn function."""
-
-        assert isinstance(dn, DN)
-        assert isinstance(newrdn, DN)
-        sctrl = self.__get_server_controls()
-
-        if dn == newrdn:
-            # no need to report an error
-            return True
-
-        try:
-            if sctrl is not None:
-                self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
-            self.modrdn_s(dn, newrdn, delold=1)
-        except ldap.LDAPError, e:
-            self.__handle_errors(e)
-        return True
-
     def updateEntry(self,dn,oldentry,newentry):
         """This wraps the mod function. It assumes that the entry is already
            populated with all of the desired objectclasses and attributes"""
@@ -658,25 +569,6 @@ class IPAdmin(IPAEntryLDAPObject):
             self.__handle_errors(e, arg_desc=arg_desc)
         return True
 
-    def modifyPassword(self, dn, oldpass, newpass):
-        """Set the user password using RFC 3062, LDAP Password Modify Extended
-           Operation. This ends up calling the IPA password slapi plugin
-           handler so the Kerberos password gets set properly.
-
-           oldpass is not mandatory
-        """
-
-        assert isinstance(dn, DN)
-        sctrl = self.__get_server_controls()
-
-        try:
-            if sctrl is not None:
-                self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl)
-            self.passwd_s(dn, oldpass, newpass)
-        except ldap.LDAPError, e:
-            self.__handle_errors(e)
-        return True
-
     def waitForEntry(self, dn, timeout=7200, attr='', quiet=True):
         scope = ldap.SCOPE_BASE
         filter = "(objectclass=*)"