pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a fallback path in bookmarks.py and use a single-dispatch function

Browse source 
(if we gave parse_from_element an Element instead of a Conference object,
it would crash)
This commit is contained in:
mathieui 2015-01-15 21:41:47 +01:00
parent 45f280f56c
commit 889eea463d
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/bookmark.py
View file

@ -74,8 +74,31 @@ class Bookmark(object):
config.set_and_save('password', self.password, section=self.jid)
return local
@functools.singledispatch
@staticmethod
def parse(el, method=None):
"""
Generate a Bookmark object from a <conference/> element
(this is a fallback for raw XML Elements)
"""
jid = el.get('jid')
name = el.get('name')
autojoin = True if el.get('autojoin', 'false').lower() in ('true', '1') else False
nick = None
for n in el.iter('nick'):
nick = n.text
password = None
for p in el.iter('password'):
password = p.text
return Bookmark(jid, name, autojoin, nick, password, method)
@staticmethod
@parse.register(Conference)
def parse_from_stanza(el, method=None):
"""
Parse a Conference element into a Bookmark object
"""
jid = el['jid']
autojoin = el['autojoin']
password = el['password']
@ -83,25 +106,6 @@ class Bookmark(object):
name = el['name']
return Bookmark(jid, name, autojoin, nick, password, method)
@staticmethod
def parse_from_element(el, method=None):
"""
Generate a Bookmark object from a <conference/> element
"""
if isinstance(el, Conference):
return Bookmark.parse_from_stanza(el, method)
jid = el.get('jid')
name = el.get('name')
autojoin = True if el.get('autojoin', 'false').lower() in ('true', '1') else False
nick = None
for n in xml.iter(el, 'nick'):
nick = n.text
password = None
for p in xml.iter(el, 'password'):
password = p.text
return Bookmark(jid, name, autojoin, nick, password, method)
bookmarks = []
def get_by_jid(value):
@ -178,7 +182,7 @@ def get_pep(xmpp, available_methods, callback):
for conf in iq['pubsub']['items']['item']['bookmarks']['conferences']:
if isinstance(conf, URL):
continue
b = Bookmark.parse_from_element(conf, method='pep')
b = Bookmark.parse(conf, method='pep')
if not get_by_jid(b.jid):
bookmarks.append(b)
if callback:
@ -195,7 +199,7 @@ def get_privatexml(xmpp, available_methods, callback):
else:
available_methods["privatexml"] = True
for conf in iq['private']['bookmarks']['conferences']:
b = Bookmark.parse_from_element(conf, method='privatexml')
b = Bookmark.parse(conf, method='privatexml')
if not get_by_jid(b.jid):
bookmarks.append(b)
if callback: