IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
both Unicode and byte strings.

433651
This commit is contained in:
Rob Crittenden 2008-02-21 11:09:53 -05:00
parent 87d9c037e4
commit 4bf136d95c
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
View File

@ -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)

2
ipa-server/ipa-gui/ipagui/subcontrollers/group.py
View File

@ -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])

4
ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py
View File

@ -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')

12
ipa-server/ipa-gui/ipagui/subcontrollers/user.py
View File

@ -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')