Fix more bytes/unicode issues

Reviewed-By: Tomas Babej <tbabej@redhat.com>

ipapython/dnsutil.py

@@ -39,7 +39,7 @@ class DNSName(dns.name.Name):
         try:
             if isinstance(labels, six.string_types):
                 #pylint: disable=E1101
-                labels = dns.name.from_unicode(unicode(labels), origin).labels
+                labels = dns.name.from_text(unicode(labels), origin).labels
             elif isinstance(labels, dns.name.Name):
                 labels = labels.labels
 

ipapython/ipaldap.py

@@ -1314,8 +1314,9 @@ class LDAPClient(object):
 
         # pass arguments to python-ldap
         with self.error_handler():
-            filter = self.encode(filter)
-            attrs_list = self.encode(attrs_list)
+            if six.PY2:
+                filter = self.encode(filter)
+                attrs_list = self.encode(attrs_list)
 
             while True:
                 if paged_search: