summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-02-21 11:09:53 -0500
committerRob Crittenden <rcritten@redhat.com>2008-02-21 11:09:53 -0500
commit4bf136d95cbcf3b13bc165d1249a3fb14525c667 (patch)
tree773d33eaafe867937e5620206b9195e00d03e2f2 /ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
parent87d9c037e40c88e803330fbb809a4c31c73a2ec4 (diff)
downloadfreeipa.git-4bf136d95cbcf3b13bc165d1249a3fb14525c667.tar.gz
freeipa.git-4bf136d95cbcf3b13bc165d1249a3fb14525c667.tar.xz
freeipa.git-4bf136d95cbcf3b13bc165d1249a3fb14525c667.zip
Use basestring class when testing to see if an object is a string to support
both Unicode and byte strings. 433651
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py')
-rw-r--r--ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
index 52426357..9b7e9305 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)