Use six.string_types instead of "basestring"

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 8a05c782e..a8525e81e 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -25,6 +25,8 @@ import time
 from copy import deepcopy
 import base64
 
+import six
+
 from ipalib import api, crud, errors
 from ipalib import Method, Object, Command
 from ipalib import Flag, Int, Str
@@ -816,7 +818,7 @@ def _check_single_value_attrs(params, entry_attrs):
 # required, make sure we enforce that.
 def _check_empty_attrs(params, entry_attrs):
     for (a, v) in entry_attrs.iteritems():
-        if v is None or (isinstance(v, basestring) and len(v) == 0):
+        if v is None or (isinstance(v, six.string_types) and len(v) == 0):
             if a in params and params[a].required:
                 raise errors.RequirementError(name=a)
 
@@ -2038,7 +2040,7 @@ class LDAPSearch(BaseLDAPCommand, crud.Search):
             config_attrs = config.get(
                 self.obj.search_attributes_config, [])
             if len(config_attrs) == 1 and (
-                isinstance(config_attrs[0], basestring)):
+                isinstance(config_attrs[0], six.string_types)):
                 search_attrs = config_attrs[0].split(',')
 
         search_kw['objectclass'] = self.obj.object_class