Changeset 9892

Timestamp:

07/06/08 23:35:19 (7 weeks ago)

Author:

steve-e

Message:

Don't crash when we receive contacts that have a group tag assigned multiple times.

Remove some usage of has_key() in the contacts module. It is a bit slower (method overhead) and will be deprecated soon.
In roster_window. make a small if-clause more pythonic.

Location:

trunk/src

Files:

• common/contacts.py (modified) (9 diffs)
• roster_window.py (modified) (1 diff)

trunk/src/common/contacts.py

@@ -172 +172 @@
                 self._contacts[account] = {}
                 self._gc_contacts[account] = {}
-                if not self._metacontacts_tags.has_key(account):
+                if account not in self._metacontacts_tags:
                         self._metacontacts_tags[account] = {}
 
@@ -188 +188 @@
                 chatstate=None, last_status_time=None, composing_xep=None,
                 mood={}, tune={}, activity={}):
-                return Contact(jid=jid, name=name, groups=groups, show=show,
+        
+                # We don't want duplicated group values
+                groups_unique = []
+                for group in groups:
+                        if group not in groups_unique:
+                                groups_unique.append(group)
+
+                return Contact(jid=jid, name=name, groups=groups_unique, show=show,
                         status=status, sub=sub, ask=ask, resource=resource, priority=priority,
                         keyID=keyID, caps_node=caps_node, caps_hash_method=caps_hash_method,
@@ -206 +213 @@
         def add_contact(self, account, contact):
                 # No such account before ?
-                if not self._contacts.has_key(account):
+                if account not in self._contacts:
                         self._contacts[account] = {contact.jid : [contact]}
                         return
                 # No such jid before ?
-                if not self._contacts[account].has_key(contact.jid):
+                if contact.jid not in self._contacts[account]:
                         self._contacts[account][contact.jid] = [contact]
                         return
@@ -227 +234 @@
 
         def remove_contact(self, account, contact):
-                if not self._contacts.has_key(account):
-                        return
-                if not self._contacts[account].has_key(contact.jid):
+                if account not in self._contacts:
+                        return
+                if contact.jid not in self._contacts[account]:
                         return
                 if contact in self._contacts[account][contact.jid]:
@@ -241 +248 @@
         def remove_jid(self, account, jid, remove_meta=True):
                 '''Removes all contacts for a given jid'''
-                if not self._contacts.has_key(account):
-                        return
-                if not self._contacts[account].has_key(jid):
+                if account not in self._contacts:
+                        return
+                if jid not in self._contacts[account]:
                         return
                 del self._contacts[account][jid]
@@ -387 +394 @@
                         self.remove_metacontact(account, jid)
                         old_tag = self.get_metacontacts_tag(account, jid)
-                if not self._metacontacts_tags[account].has_key(tag):
+                if tag not in self._metacontacts_tags[account]:
                         self._metacontacts_tags[account][tag] = [{'jid': jid, 'tag': tag}]
                 else:
@@ -558 +565 @@
         def add_gc_contact(self, account, gc_contact):
                 # No such account before ?
-                if not self._gc_contacts.has_key(account):
+                if account not in self._gc_contacts:
                         self._contacts[account] = {gc_contact.room_jid : {gc_contact.name: \
                                 gc_contact}}
                         return
                 # No such room_jid before ?
-                if not self._gc_contacts[account].has_key(gc_contact.room_jid):
+                if gc_contact.room_jid not in self._gc_contacts[account]:
                         self._gc_contacts[account][gc_contact.room_jid] = {gc_contact.name: \
                                 gc_contact}
@@ -571 +578 @@
 
         def remove_gc_contact(self, account, gc_contact):
-                if not self._gc_contacts.has_key(account):
-                        return
-                if not self._gc_contacts[account].has_key(gc_contact.room_jid):
-                        return
-                if not self._gc_contacts[account][gc_contact.room_jid].has_key(
-                        gc_contact.name):
+                if account not in self._gc_contacts:
+                        return
+                if gc_contact.room_jid not in self._gc_contacts[account]:
+                        return
+                if gc_contact.name not in self._gc_contacts[account][
+                gc_contact.room_jid]:
                         return
                 del self._gc_contacts[account][gc_contact.room_jid][gc_contact.name]
@@ -584 +591 @@
 
         def remove_room(self, account, room_jid):
-                if not self._gc_contacts.has_key(account):
-                        return
-                if not self._gc_contacts[account].has_key(room_jid):
+                if account not in self._gc_contacts:
+                        return
+                if room_jid not in self._gc_contacts[account]:
                         return
                 del self._gc_contacts[account][room_jid]
 
         def get_gc_list(self, account):
-                if not self._gc_contacts.has_key(account):
+                if account not in self._gc_contacts:
                         return []
                 return self._gc_contacts[account].keys()

trunk/src/roster_window.py

@@ -1469 +1469 @@
                                 resource = '/'.join(jids[1:])
                         # get name
-                        name = array[jid]['name']
-                        if not name:
-                                name = ''
+                        name = array[jid]['name'] or ''
                         show = 'offline' # show is offline by default
                         status = '' # no status message by default