summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2017-02-02 16:51:21 +0100
committerMartin Basti <mbasti@redhat.com>2017-02-08 15:41:39 +0100
commit6bb5af7bea21d44b4e5ee20cfaa2f76b12ea0929 (patch)
treeef0fd2e77db24e2b1261ac8405511c1ee5e1434f /ipapython
parentd38540acd614bcaa489023401fc8db7c02cd3892 (diff)
downloadfreeipa-6bb5af7bea21d44b4e5ee20cfaa2f76b12ea0929.tar.gz
freeipa-6bb5af7bea21d44b4e5ee20cfaa2f76b12ea0929.tar.xz
freeipa-6bb5af7bea21d44b4e5ee20cfaa2f76b12ea0929.zip
py3: get_memberofindirect: fix ByteWarnings
DN must be converted to bytes as other variables adn lists contain bytes https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipaldap.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 37d23d731..c811431f1 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -379,8 +379,10 @@ class LDAPEntry(collections.MutableMapping):
name, value.__class__.__name__, value))
for (i, item) in enumerate(value):
if not isinstance(item, bytes):
- raise TypeError("%s[%d] value must be str, got %s object %r" % (
- name, i, item.__class__.__name__, item))
+ raise TypeError(
+ "%s[%d] value must be bytes, got %s object %r" % (
+ name, i, item.__class__.__name__, item)
+ )
name = self._add_attr_name(name)