# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1573210521 -3600
# Node ID 73db9db8b9e12a3db8cde2fc2faf5b751596b245
# Parent  e189ceca7e8ba4c6f717bea24d2e5ac8f31a630c
plugin XEP-0277: fixed comments URLs parsing

diff -r e189ceca7e8b -r 73db9db8b9e1 sat/plugins/plugin_xep_0060.py
--- a/sat/plugins/plugin_xep_0060.py	Fri Nov 08 11:47:42 2019 +0100
+++ b/sat/plugins/plugin_xep_0060.py	Fri Nov 08 11:55:21 2019 +0100
@@ -1128,10 +1128,8 @@
         """
         items, metadata = items_data
 
-        def eb(failure):
-            log.warning(
-                "Error while serialising/parsing item: {}".format(str(failure.value))
-            )
+        def eb(failure_):
+            log.warning(f"Error while serialising/parsing item: {failure_.value}")
 
         d = defer.gatherResults([item_cb(item).addErrback(eb) for item in items])
 
diff -r e189ceca7e8b -r 73db9db8b9e1 sat/plugins/plugin_xep_0277.py
--- a/sat/plugins/plugin_xep_0277.py	Fri Nov 08 11:47:42 2019 +0100
+++ b/sat/plugins/plugin_xep_0277.py	Fri Nov 08 11:55:21 2019 +0100
@@ -365,8 +365,8 @@
                 microblog_data[key] = link_elt["href"]
                 try:
                     service, node = self.parseCommentUrl(microblog_data[key])
-                except:
-                    log.warning("Can't parse url {}".format(microblog_data[key]))
+                except Exception as e:
+                    log.warning(f"Can't parse url {microblog_data[key]}: {e}")
                     del microblog_data[key]
                 else:
                     microblog_data["{}_service".format(key)] = service.full()
@@ -853,7 +853,7 @@
         """
         parsed_url = urllib.parse.urlparse(node_url, "xmpp")
         service = jid.JID(parsed_url.path)
-        parsed_queries = urllib.parse.parse_qs(parsed_url.query.encode("utf-8"))
+        parsed_queries = urllib.parse.parse_qs(parsed_url.query)
         node = parsed_queries.get("node", [""])[0]
 
         if not node: