From 4bf136d95cbcf3b13bc165d1249a3fb14525c667 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 21 Feb 2008 11:09:53 -0500 Subject: Use basestring class when testing to see if an object is a string to support both Unicode and byte strings. 433651 --- ipa-server/ipa-gui/ipagui/subcontrollers/user.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/user.py') diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py index 6ff27409..1c34be9c 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') -- cgit