From 80afa4ed3738d166accfd5cf5339f4a20627d3bb Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 23 Feb 2014 23:59:02 +0100 Subject: [PATCH] plugin XEP-0277: last commit was actually a part of the next one --- src/plugins/plugin_xep_0277.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/plugin_xep_0277.py b/src/plugins/plugin_xep_0277.py index c0118007..d2142466 100755 --- a/src/plugins/plugin_xep_0277.py +++ b/src/plugins/plugin_xep_0277.py @@ -71,12 +71,6 @@ class XEP_0277(object): 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 @@ class XEP_0277(object): 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'))