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

contacts.py: get_contact_from_full_jid not to raise exceptions on bare jids

Browse source
This commit is contained in:
Tomasz Melcer 2007-06-27 23:26:07 +00:00
parent 6995730808
commit 976cd12eef
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/contacts.py
View file

@ -236,8 +236,12 @@ class Contacts:
def get_contact_from_full_jid(self, account, jid): def get_contact_from_full_jid(self, account, jid):
'''we will split the jid into bare jid and resource part, '''we will split the jid into bare jid and resource part,
then get proper contact.''' then get proper contact.'''
barejid, resource=jid.split('/',1) try:
return self.get_contact(account, barejid, resource) barejid, resource=jid.split('/',1)
return self.get_contact(account, barejid, resource)
except ValueError: # no resource causes split to fail
return None # how to handle that case?
def get_highest_prio_contact_from_contacts(self, contacts): def get_highest_prio_contact_from_contacts(self, contacts):
if not contacts: if not contacts:
return None return None