diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-08-10 18:29:33 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-09-01 11:42:01 +0200 |
| commit | dd16cc98b0d67f1448bf9de25f8adce512b1431c (patch) | |
| tree | e9fa6c41da6894b16a366b02d61c29b15c5a9b4a /ipalib/plugins/dns.py | |
| parent | 404177f7a322ced4e05cfc6b2ed330b6fcce0c04 (diff) | |
| download | freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.gz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.xz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.zip | |
Use six.string_types instead of "basestring"
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/plugins/dns.py')
| -rw-r--r-- | ipalib/plugins/dns.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 23871a58f..10c4987af 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -24,11 +24,13 @@ import netaddr import time import re import binascii +import encodings.idna + import dns.name import dns.exception import dns.rdatatype import dns.resolver -import encodings.idna +import six from ipalib.request import context from ipalib import api, errors, output @@ -1671,7 +1673,7 @@ def _create_idn_filter(cmd, ldap, *args, **options): config = ldap.get_ipa_config() config_attrs = config.get(cmd.obj.search_attributes_config, []) if len(config_attrs) == 1 and (isinstance(config_attrs[0], - basestring)): + six.string_types)): search_attrs = config_attrs[0].split(',') search_kw['objectclass'] = cmd.obj.object_class |