copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

isinstance is faster than type and on key bindings that call gajim-remote some ms surely matter

This commit is contained in:
Nikos Kouremenos 2006-02-09 00:00:17 +00:00
parent 07b2d4c16b
commit f0f7d74a90
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gajim-remote.py
View File

@ -340,36 +340,35 @@ class GajimRemote:
def print_info(self, level, prop_dict): def print_info(self, level, prop_dict):
''' return formated string from serialized vcard data ''' ''' return formated string from serialized vcard data '''
if prop_dict is None or type(prop_dict) \ if prop_dict is None or not isinstance(prop_dict, dict, list, tuple):
not in (dict, list, tuple):
return '' return ''
ret_str = '' ret_str = ''
if type(prop_dict) in (list, tuple): if isinstance(prop_dict, list, tuple):
ret_str = '' ret_str = ''
spacing = ' ' * level * 4 spacing = ' ' * level * 4
for val in prop_dict: for val in prop_dict:
if val is None: if val is None:
ret_str +='\t' ret_str +='\t'
elif type(val) in (unicode, int, str): elif isinstance(val, unicode, int, str):
ret_str +='\t' + str(val) ret_str +='\t' + str(val)
elif type(val) in (list, tuple): elif isinstance(val, list, tuple):
res = '' res = ''
for items in val: for items in val:
res += self.print_info(level+1, items) res += self.print_info(level+1, items)
if res != '': if res != '':
ret_str += '\t' + res ret_str += '\t' + res
elif type(val) == dict: elif isinstance(val, dict):
ret_str += self.print_info(level+1, val) ret_str += self.print_info(level+1, val)
ret_str = '%s(%s)\n' % (spacing, ret_str[1:]) ret_str = '%s(%s)\n' % (spacing, ret_str[1:])
elif isinstance(prop_dict, dict): elif isinstance(prop_dict, dict):
for key in prop_dict.keys(): for key in prop_dict.keys():
val = prop_dict[key] val = prop_dict[key]
spacing = ' ' * level * 4 spacing = ' ' * level * 4
if type(val) in (unicode, int, str): if isinstance(val, unicode, int, str):
if val is not None: if val is not None:
val = val.strip() val = val.strip()
ret_str += '%s%-10s: %s\n' % (spacing, key, val) ret_str += '%s%-10s: %s\n' % (spacing, key, val)
elif type(val) in (list, tuple): elif isinstance(val, list, tuple):
res = '' res = ''
for items in val: for items in val:
res += self.print_info(level+1, items) res += self.print_info(level+1, items)
@ -467,7 +466,7 @@ class GajimRemote:
if value[1] == '}': if value[1] == '}':
break break
key, next = self.unrepr(value[1:]) key, next = self.unrepr(value[1:])
if type(key) not in (str, unicode): if not isinstance(key, str, unicode):
send_error('Wrong string: %s' % value) send_error('Wrong string: %s' % value)
next = next.strip() next = next.strip()
if not next or next[0] != ':': if not next or next[0] != ':':