Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly convert objects to unicode #2

Open
wants to merge 1 commit into
base: python3
Choose a base branch
from
Open

Explicitly convert objects to unicode #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions ldapom/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,20 +402,16 @@ def save(self, entry):
raise error.LDAPomError("Cannot save without attributes "
"previously fetched or set.")

# Temporary attribute set that will contain deleted attributes as
# LDAPAttribute objects without any values.
save_attributes = entry.attributes.copy()
if entry_exists:
deleted_attribute_names = entry._old_attribute_names.difference(
[a.name for a in entry.attributes])
for name in deleted_attribute_names:
attribute_type = self.get_attribute_type(name)
save_attributes.add(attribute_type(name))

if not entry_exists:
# Don't try to save empty attributes as this fails if the entry
# does not exist on the server yet.
save_attributes = filter(lambda a: a._values > 0, save_attributes)
# remove empty attributes as ldap_add_ext_s can't handle them
is_empty = lambda attr: len(attr._get_ldap_values()) > 0
save_attributes = set(filter(is_empty, entry.attributes))

# add deleted attributes as empty attributes (LDAPAttribute objects without any values)
deleted_attribute_names = entry._old_attribute_names.difference(
[a.name for a in save_attributes])
for name in deleted_attribute_names:
attribute_type = self.get_attribute_type(name)
save_attributes.add(attribute_type(name))

# Keep around references to pointers to owned memory with data that is
# still needed.
Expand Down Expand Up @@ -444,7 +440,7 @@ def save(self, entry):
mods[i] = mod
mods[len(save_attributes)] = ffi.NULL

if entry_exists:
if entry.exists():
err = ldap.ldap_modify_ext_s(self._ld,
compat._encode_utf8(entry.dn),
mods,
Expand Down
2 changes: 1 addition & 1 deletion ldapom/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __init__(self, connection, dn, attributes=None):
super(LDAPEntry, self).__setattr__('attributes', set(attributes)
if attributes is not None else None)
super(LDAPEntry, self).__setattr__('_old_attribute_names',
set([a.name for a in attributes]) if attributes else None)
set([a.name for a in attributes]) if attributes else set())

## Expose dn as a ready-only property
dn = property(lambda self: self._dn)
Expand Down