diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-02-21 11:09:53 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-02-21 11:09:53 -0500 |
| commit | 4bf136d95cbcf3b13bc165d1249a3fb14525c667 (patch) | |
| tree | 773d33eaafe867937e5620206b9195e00d03e2f2 /ipa-server/ipa-gui/ipagui/subcontrollers/user.py | |
| parent | 87d9c037e40c88e803330fbb809a4c31c73a2ec4 (diff) | |
| download | freeipa.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/user.py')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/subcontrollers/user.py | 12 |
1 files changed, 6 insertions, 6 deletions
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') |