openstack/deb-python-pyldap
Code Issues Proposed changes

Fix add_ext on Python2 (Closes #15).

Browse Source 
Under Python2, the code was breaking because add_ext and modify_ext use
slightly different notions of a modlist: one expects a tuple of
(operation, attribute_name, new_values) and the other a tuple of
(attribute_name, new_values).

The Py2/Py3 compatibility code didn't check for the latter.
This commit is contained in:
Raphaël Barrois
2016-03-10 11:32:18 +01:00
parent b323ffd746
commit 3e2d88996c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/ldap/ldapobject.py
View File

@@ -151,7 +151,7 @@ class SimpleLDAPObject:
for value in values for value in values
) )
def _unbytesify_modlist(self, modlist): def _unbytesify_modlist(self, modlist, with_opcode):
"""Adapt a modlist according to bytes_mode. """Adapt a modlist according to bytes_mode.
A modlist is a tuple of (op, attr, value), where: A modlist is a tuple of (op, attr, value), where:
@@ -161,10 +161,16 @@ class SimpleLDAPObject:
""" """
if not PY2: if not PY2:
return modlist return modlist
return tuple( if with_opcode:
(op, self._unbytesify_value(attr), val) return tuple(
for op, attr, val in modlist (op, self._unbytesify_value(attr), val)
) for op, attr, val in modlist
)
else:
return tuple(
(self._unbytesify_value(attr), val)
for attr, val in modlist
)
def _bytesify_value(self, value): def _bytesify_value(self, value):
"""Adapt a returned value according to bytes_mode. """Adapt a returned value according to bytes_mode.
@@ -340,7 +346,7 @@ class SimpleLDAPObject:
except that no operation integer need be included in the tuples. except that no operation integer need be included in the tuples.
""" """
dn = self._unbytesify_value(dn) dn = self._unbytesify_value(dn)
modlist = self._unbytesify_modlist(modlist) modlist = self._unbytesify_modlist(modlist, with_opcode=False)
return self._ldap_call(self._l.add_ext,dn,modlist,RequestControlTuples(serverctrls),RequestControlTuples(clientctrls)) return self._ldap_call(self._l.add_ext,dn,modlist,RequestControlTuples(serverctrls),RequestControlTuples(clientctrls))
def add_ext_s(self,dn,modlist,serverctrls=None,clientctrls=None): def add_ext_s(self,dn,modlist,serverctrls=None,clientctrls=None):
@@ -524,7 +530,7 @@ class SimpleLDAPObject:
modify_ext(dn, modlist[,serverctrls=None[,clientctrls=None]]) -> int modify_ext(dn, modlist[,serverctrls=None[,clientctrls=None]]) -> int
""" """
dn = self._unbytesify_value(dn) dn = self._unbytesify_value(dn)
modlist = self._unbytesify_modlist(modlist) modlist = self._unbytesify_modlist(modlist, with_opcode=True)
return self._ldap_call(self._l.modify_ext,dn,modlist,RequestControlTuples(serverctrls),RequestControlTuples(clientctrls)) return self._ldap_call(self._l.modify_ext,dn,modlist,RequestControlTuples(serverctrls),RequestControlTuples(clientctrls))
def modify_ext_s(self,dn,modlist,serverctrls=None,clientctrls=None): def modify_ext_s(self,dn,modlist,serverctrls=None,clientctrls=None):