IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Raise an exception when legacy LDAP API is used.

Browse Source
This commit is contained in:
Jan Cholasta 2014-01-07 12:46:59 +01:00 committed by Petr Viktorin
parent 9d863e9a96
commit 5737eaf134
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ipapython/ipaldap.py
View File

@ -81,6 +81,11 @@ def value_to_utf8(val):
return unicode(val).encode('utf-8') return unicode(val).encode('utf-8')
# FIXME: Remove when python-ldap tuple compatibility is dropped
def raise_deprecation_error():
raise RuntimeError(
"this API has been deprecated, see http://www.freeipa.org/page/"
"HowTo/Migrate_your_code_to_the_new_LDAP_API")
class _ServerSchema(object): class _ServerSchema(object):
''' '''
@ -918,10 +923,8 @@ class LDAPEntry(collections.MutableMapping):
def __getitem__(self, name): def __getitem__(self, name):
# FIXME: Remove when python-ldap tuple compatibility is dropped # FIXME: Remove when python-ldap tuple compatibility is dropped
if name == 0: if name in (0, 1):
return self._dn raise_deprecation_error()
elif name == 1:
return self
return self._get_nice(name) return self._get_nice(name)
@ -1009,8 +1012,7 @@ class LDAPEntry(collections.MutableMapping):
# FIXME: Remove when python-ldap tuple compatibility is dropped # FIXME: Remove when python-ldap tuple compatibility is dropped
def __iter__(self): def __iter__(self):
yield self._dn raise_deprecation_error()
yield self
# FIXME: Remove when python-ldap tuple compatibility is dropped # FIXME: Remove when python-ldap tuple compatibility is dropped
def iterkeys(self): def iterkeys(self):
@ -1557,12 +1559,9 @@ class LDAPClient(object):
"""Create a new entry. """Create a new entry.
This should be called as add_entry(entry). This should be called as add_entry(entry).
The legacy two-argument variant is:
add_entry(dn, entry_attrs)
""" """
if entry_attrs is not None: if entry_attrs is not None:
entry = self.make_entry(entry, entry_attrs) raise_deprecation_error()
# remove all [] values (python-ldap hates 'em) # remove all [] values (python-ldap hates 'em)
attrs = dict((k, v) for k, v in entry.raw.iteritems() if v) attrs = dict((k, v) for k, v in entry.raw.iteritems() if v)
@ -1570,8 +1569,7 @@ class LDAPClient(object):
with self.error_handler(): with self.error_handler():
self.conn.add_s(entry.dn, attrs.items()) self.conn.add_s(entry.dn, attrs.items())
if entry_attrs is None: entry.reset_modlist()
entry.reset_modlist()
def update_entry_rdn(self, dn, new_rdn, del_old=True): def update_entry_rdn(self, dn, new_rdn, del_old=True):
""" """
@ -1594,13 +1592,9 @@ class LDAPClient(object):
"""Update entry's attributes. """Update entry's attributes.
This should be called as update_entry(entry). This should be called as update_entry(entry).
The legacy two-argument variant is:
update_entry(dn, entry_attrs)
""" """
if entry_attrs is not None: if entry_attrs is not None:
entry = self.get_entry(entry, entry_attrs.keys()) raise_deprecation_error()
entry.update(entry_attrs)
# generate modlist # generate modlist
modlist = entry.generate_modlist() modlist = entry.generate_modlist()
@ -1611,8 +1605,7 @@ class LDAPClient(object):
with self.error_handler(): with self.error_handler():
self.conn.modify_s(entry.dn, modlist) self.conn.modify_s(entry.dn, modlist)
if entry_attrs is None: entry.reset_modlist()
entry.reset_modlist()
def delete_entry(self, entry_or_dn): def delete_entry(self, entry_or_dn):
"""Delete an entry given either the DN or the entry itself""" """Delete an entry given either the DN or the entry itself"""