Use basestring class when testing to see if an object is a string to support

both Unicode and byte strings.

433651

4 files changed, 12 insertions, 10 deletions

diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
index 524263570..9b7e93059 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
@@ -107,7 +107,7 @@ class DelegationController(IPAController):
             new_aci.source_group = kw.get('source_group_dn')
             new_aci.dest_group = kw.get('dest_group_dn')
             new_aci.attrs = kw.get('attrs')
-            if isinstance(new_aci.attrs, str):
+            if isinstance(new_aci.attrs, basestring):
                 new_aci.attrs = [new_aci.attrs]
 
             # Look for an existing ACI of the same name
@@ -211,6 +211,8 @@ class DelegationController(IPAController):
             new_aci.source_group = kw.get('source_group_dn')
             new_aci.dest_group = kw.get('dest_group_dn')
             new_aci.attrs = kw.get('attrs')
+            if isinstance(new_aci.attrs, basestring):
+                new_aci.attrs = [new_aci.attrs]
             new_aci_str = new_aci.export_to_string()
 
             new_aci_str_list = copy.copy(aci_str_list)
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
index 6baec5421..8d0747625 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
@@ -239,7 +239,7 @@ class GroupController(IPAController):
             # if cancelling need to use the original group because the one
             # in kw may not exist yet.
             cn = orig_group_dict.get('cn')
-            if (isinstance(cn,str)):
+            if (isinstance(cn,basestring)):
                 cn = [cn]
             turbogears.flash("Edit group cancelled")
             raise turbogears.redirect('/group/show', cn=cn[0])
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py b/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py
index 6d28de2ed..4f455b9c3 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py
@@ -90,11 +90,11 @@ class IPAPolicyController(IPAController):
             ipapolicy_dict.update(password_dict)
 
             # Load potential multi-valued fields
-            if isinstance(ipapolicy_dict.get('ipauserobjectclasses',''), str):
+            if isinstance(ipapolicy_dict.get('ipauserobjectclasses',''), basestring):
                 ipapolicy_dict['ipauserobjectclasses'] = [ipapolicy_dict.get('ipauserobjectclasses')]
             ipapolicy_dict['userobjectclasses'] = ipahelper.setup_mv_fields(ipapolicy_dict.get('ipauserobjectclasses'), 'ipauserobjectclasses')
 
-            if isinstance(ipapolicy_dict.get('ipagroupobjectclasses',''), str):
+            if isinstance(ipapolicy_dict.get('ipagroupobjectclasses',''), basestring):
                 ipapolicy_dict['ipagroupobjectclasses'] = [ipapolicy_dict.get('ipagroupobjectclasses')]
             ipapolicy_dict['groupobjectclasses'] = ipahelper.setup_mv_fields(ipapolicy_dict.get('ipagroupobjectclasses'), 'ipagroupobjectclasses')
 
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
index 6ff274096..1c34be9c9 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py
@@ -113,27 +113,27 @@ class UserController(IPAController):
            it is None it will cause an error to be thrown."""
 
         # Load potential multi-valued fields
-        if isinstance(user_dict['cn'], str):
+        if isinstance(user_dict['cn'], basestring):
             user_dict['cn'] = [user_dict['cn']]
         user_dict['cns'] = ipahelper.setup_mv_fields(user_dict['cn'], 'cn')
 
-        if isinstance(user_dict.get('telephonenumber',''), str):
+        if isinstance(user_dict.get('telephonenumber',''), basestring):
             user_dict['telephonenumber'] = [user_dict.get('telephonenumber')]
         user_dict['telephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('telephonenumber'), 'telephonenumber')
 
-        if isinstance(user_dict.get('facsimiletelephonenumber',''), str):
+        if isinstance(user_dict.get('facsimiletelephonenumber',''), basestring):
             user_dict['facsimiletelephonenumber'] = [user_dict.get('facsimiletelephonenumber')]
         user_dict['facsimiletelephonenumbers'] = ipahelper.setup_mv_fields(user_dict.get('facsimiletelephonenumber'), 'facsimiletelephonenumber')
 
-        if isinstance(user_dict.get('mobile',''), str):
+        if isinstance(user_dict.get('mobile',''), basestring):
             user_dict['mobile'] = [user_dict.get('mobile')]
         user_dict['mobiles'] = ipahelper.setup_mv_fields(user_dict.get('mobile'), 'mobile')
 
-        if isinstance(user_dict.get('pager',''), str):
+        if isinstance(user_dict.get('pager',''), basestring):
             user_dict['pager'] = [user_dict.get('pager')]
         user_dict['pagers'] = ipahelper.setup_mv_fields(user_dict.get('pager'), 'pager')
 
-        if isinstance(user_dict.get('homephone',''), str):
+        if isinstance(user_dict.get('homephone',''), basestring):
             user_dict['homephone'] = [user_dict.get('homephone')]
         user_dict['homephones'] = ipahelper.setup_mv_fields(user_dict.get('homephone'), 'homephone')