# HG changeset patch # User Goffi # Date 1393196342 -3600 # Node ID 03addfe98b64ebe3e23913dda8fe275dbce30814 # Parent 762b191e1e1e654692e5e368973e9464fbe0f5a8 plugin XEP-0277: last commit was actually a part of the next one diff -r 762b191e1e1e -r 03addfe98b64 src/plugins/plugin_xep_0277.py --- a/src/plugins/plugin_xep_0277.py Sun Feb 23 23:30:35 2014 +0100 +++ b/src/plugins/plugin_xep_0277.py Sun Feb 23 23:59:02 2014 +0100 @@ -71,12 +71,6 @@ doc={}) def parseCommentUrl(self, node_url): - """Determine the fields comments_service and comments_node of a microblog data - from the href attribute of an entry's link element. For example this input: - xmpp:sat-pubsub.libervia.org?node=urn%3Axmpp%3Acomments%3A_c5c4a142-2279-4b2a-ba4c-1bc33aa87634__urn%3Axmpp%3Agroupblog%3Asouliane%libervia.org - will return (JID(u'sat-pubsub.libervia.org'), 'urn:xmpp:comments:_c5c4a142-2279-4b2a-ba4c-1bc33aa87634__urn:xmpp:groupblog:souliane%libervia.org') - @return: a tuple (JID, str) - """ parsed_url = urlparse.urlparse(node_url, 'xmpp') service = jid.JID(parsed_url.path) queries = parsed_url.query.split(';') @@ -160,7 +154,7 @@ microblog_data['comments_node'] = node break except (KeyError, exceptions.DataError, RuntimeError): - warning(_("Can't parse the link element of pubsub entry %s") % item['id']) + warning("Can't parse link") continue except (AttributeError, KeyError): error(_('Error while parsing atom entry for microblogging event'))