compatibilidad python3

action_plugins/ldap.py

@@ -11,6 +11,7 @@ import sys
 import re
 import base64
 import io
+from six import string_types
 try:
     import ldap
     import ldif
@@ -265,7 +266,7 @@ class ActionModule(ActionBase):
 
         qfilter = '(objectClass=*)'
         # armar el filtro de búsqueda agregando los filtros adicionales
-        if isinstance(self.search_filter, basestring):
+        if isinstance(self.search_filter, string_types):
             qfilter = self.search_filter
         else:
             for f in self.search_filter:
@@ -380,7 +381,7 @@ class ActionModule(ActionBase):
         '''Verificar/actualizar valor para un atributo'''
 
         if attribute in self.ATTR_PASSWORD:
-            if not isinstance(value, basestring):
+            if not isinstance(value, string_types):
                 value = value[0]
             if checkPassword(self.attrs.get(attribute,[None])[0], value):
                 # si la clave matchea, salir
@@ -395,7 +396,7 @@ class ActionModule(ActionBase):
                 value = [makeSecret(value)]
 
         # convertir el valor a una lista
-        if isinstance(value, basestring):
+        if isinstance(value, string_types):
             value = [value]
 
         changed = False