Use six.string_types instead of "basestring"

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin
2015-08-10 18:29:33 +02:00
committed by Jan Cholasta
parent 404177f7a3
commit dd16cc98b0
22 changed files with 114 additions and 71 deletions

View File

@@ -26,6 +26,7 @@ import sys
import time
import ldap
import six
from ipaserver.install import installutils
from ipaserver.install import service
@@ -178,7 +179,7 @@ def named_conf_set_directive(name, value, section=NAMED_SECTION_IPA,
if name == match.group('name'):
matched = True
if value is not None:
if not isinstance(value, basestring):
if not isinstance(value, six.string_types):
value = str(value)
new_conf = named_conf_arg_template \
% dict(indent=last_indent,