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

dict.remove() doesn't exists, it's del dict[]

This commit is contained in:
Yann Leboulanger 2006-01-01 18:47:26 +00:00
parent 6bcc3c746c
commit 0b9e57a16d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/contacts.py
View File

@ -79,8 +79,8 @@ class Contacts:
def change_account_name(self, old_name, new_name): def change_account_name(self, old_name, new_name):
self._contacts[new_name] = self._contacts[old_name] self._contacts[new_name] = self._contacts[old_name]
self._gc_contacts[new_name] = self._gc_contacts[old_name] self._gc_contacts[new_name] = self._gc_contacts[old_name]
self._contacts.remove(old_name) del self._contacts[old_name]
self._gc_contacts.remove(old_name) del self._gc_contacts[old_name]
def add_account(self, account): def add_account(self, account):
self._contacts[account] = {} self._contacts[account] = {}
@ -90,8 +90,8 @@ class Contacts:
return self._contacts.keys() return self._contacts.keys()
def remove_account(self, account): def remove_account(self, account):
self._contacts.remove(account) del self._contacts[account]
self._gc_contacts.remove(account) del self._gc_contacts[account]
def create_contact(self, jid='', name='', groups=[], show='', status='', def create_contact(self, jid='', name='', groups=[], show='', status='',
sub='', ask='', resource='', priority=5, keyID='', our_chatstate=None, sub='', ask='', resource='', priority=5, keyID='', our_chatstate=None,
@ -131,7 +131,7 @@ class Contacts:
self._contacts[account][contact.jid].remove(contact) self._contacts[account][contact.jid].remove(contact)
# It was the last resource of this contact ? # It was the last resource of this contact ?
if not len(self._contacts[account][contact.jid]): if not len(self._contacts[account][contact.jid]):
self._contacts[account].remove(contact.jid) del self._contacts[account][contact.jid]
def remove_jid(self, account, jid): def remove_jid(self, account, jid):
'''Removes all contacts for a given jid''' '''Removes all contacts for a given jid'''
@ -257,14 +257,14 @@ class Contacts:
self._gc_contacts[account][gc_contact.room_jid].remove(gc_contact.nick) self._gc_contacts[account][gc_contact.room_jid].remove(gc_contact.nick)
# It was the last nick in room ? # It was the last nick in room ?
if not len(self._gc_contacts[account][gc_contact.room_jid]): if not len(self._gc_contacts[account][gc_contact.room_jid]):
self._gc_contacts[account].remove(gc_contact.room_jid) del self._gc_contacts[account][gc_contact.room_jid]
def remove_room(self, account, room_jid): def remove_room(self, account, room_jid):
if not self._gc_contacts.has_key(account): if not self._gc_contacts.has_key(account):
return return
if not self._gc_contacts[account].has_key(room_jid): if not self._gc_contacts[account].has_key(room_jid):
return return
self._gc_contacts[account].remove(room_jid) del self._gc_contacts[account][room_jid]
def get_gc_contact(self, account, room_jid, nick): def get_gc_contact(self, account, room_jid, nick):
if not self._gc_contacts.has_key(account): if not self._gc_contacts.has_key(account):
@ -273,7 +273,7 @@ class Contacts:
return return
if not self._gc_contacts[account][room_jid].has_key(nick): if not self._gc_contacts[account][room_jid].has_key(nick):
return return
self._gc_contacts[account][room_jid].remove(nick) del self._gc_contacts[account][room_jid][nick]
def get_gc_list(self, account): def get_gc_list(self, account):
if not self._gc_contacts.has_key(account): if not self._gc_contacts.has_key(account):