diff src/plugins/plugin_misc_groupblog.py @ 1409:3265a2639182

massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions
author souliane <souliane@mailoo.org>
date Thu, 16 Apr 2015 14:57:57 +0200
parents 069ad98b360d
children be2df1ddea8e
line wrap: on
line diff
--- a/src/plugins/plugin_misc_groupblog.py	Thu Apr 16 13:31:14 2015 +0200
+++ b/src/plugins/plugin_misc_groupblog.py	Thu Apr 16 14:57:57 2015 +0200
@@ -164,12 +164,12 @@
             # item_access_pubsubs = yield self.host.findFeaturesSet((NS_PUBSUB_ITEM_ACCESS, NS_PUBSUB_AUTO_CREATE, NS_PUBSUB_CREATOR_JID_CHECK), "pubsub", "service", profile_key=profile)
             try:
                 client.item_access_pubsub = item_access_pubsubs.pop()
-                log.info(_("item-access powered pubsub service found: [%s]") % client.item_access_pubsub.full())
+                log.info(_(u"item-access powered pubsub service found: [%s]") % client.item_access_pubsub.full())
             except KeyError:
                 client.item_access_pubsub = None
 
         if not client.item_access_pubsub:
-            log.error(_("No item-access powered pubsub server found, can't use group blog"))
+            log.error(_(u"No item-access powered pubsub server found, can't use group blog"))
             raise NoCompatiblePubSubServerFound
 
         defer.returnValue((profile, client))
@@ -187,7 +187,7 @@
             if (not (origin_host)
                     or len(event_host) < len(origin_host)
                     or event_host[-len(origin_host):] != origin_host):
-                log.warning("Host incoherence between %s and %s (hack attempt ?)" % (unicode(event.sender),
+                log.warning(u"Host incoherence between %s and %s (hack attempt ?)" % (unicode(event.sender),
                                                                                  unicode(publisher)))
                 return False
 
@@ -398,10 +398,10 @@
                 # remove the associated comments node
                 comments_service, comments_node = self.host.plugins["XEP-0277"].parseCommentUrl(comments)
                 d = self.host.plugins["XEP-0060"].deleteNode(comments_service, comments_node, profile_key=profile)
-                d.addErrback(lambda failure: log.error("Deletion of node %s failed: %s" % (comments_node, failure.getErrorMessage())))
+                d.addErrback(lambda failure: log.error(u"Deletion of node %s failed: %s" % (comments_node, failure.getErrorMessage())))
             # remove the item itself
             d = self.host.plugins["XEP-0060"].retractItems(service_jid, node, [item_id], profile_key=profile)
-            d.addErrback(lambda failure: log.error("Deletion of item %s from %s failed: %s" % (item_id, node, failure.getErrorMessage())))
+            d.addErrback(lambda failure: log.error(u"Deletion of item %s from %s failed: %s" % (item_id, node, failure.getErrorMessage())))
             return d
 
         def notify(d):
@@ -450,7 +450,7 @@
                 self.__fillCommentsElement(mblog_data, entry_id, node, service_jid)
             entry_d = self.host.plugins["XEP-0277"].data2entry(mblog_data, profile)
             entry_d.addCallback(lambda mblog_item: self.host.plugins["XEP-0060"].publish(service_jid, node, items=[mblog_item], profile_key=profile))
-            entry_d.addErrback(lambda failure: log.error("Modification of %s failed: %s" % (pub_data, failure.getErrorMessage())))
+            entry_d.addErrback(lambda failure: log.error(u"Modification of %s failed: %s" % (pub_data, failure.getErrorMessage())))
             return entry_d
 
         return self._initialise(profile_key).addCallback(initialised)
@@ -494,14 +494,14 @@
             try:
                 gbdata['service'] = client.item_access_pubsub.full()
             except AttributeError:
-                log.warning(_("Pubsub service is unknown for blog entry %s") % gbdata['id'])
+                log.warning(_(u"Pubsub service is unknown for blog entry %s") % gbdata['id'])
             # every comments node must be subscribed, except if we are the publisher (we are already subscribed in this case)
             if "comments_node" in gbdata and pub_jid.userhostJID() != client.jid.userhostJID():
                 try:
                     service = jid.JID(gbdata["comments_service"])
                     node = gbdata["comments_node"]
                 except KeyError:
-                    log.error(_("Missing key for blog comment %s") % gbdata['id'])
+                    log.error(_(u"Missing key for blog comment %s") % gbdata['id'])
                     defer.returnValue(gbdata)
                 # TODO: see if it is really needed to check for not subscribing twice to the node
                 # It previously worked without this check, but the pubsub service logs were polluted
@@ -766,14 +766,14 @@
                 d_list = []
                 for node in [node for node in nodes if node.endswith(main_node)]:
                     d = self.host.plugins["XEP-0060"].deleteNode(service, node, profile_key=profile)
-                    d.addErrback(lambda failure: log.error(_("Deletion of node %(node)s failed: %(message)s") %
+                    d.addErrback(lambda failure: log.error(_(u"Deletion of node %(node)s failed: %(message)s") %
                                                            {'node': node, 'message': failure.getErrorMessage()}))
                     d_list.append(d)
                 return defer.DeferredList(d_list)
 
             d = self.host.plugins["XEP-0060"].listNodes(service, profile=profile)
             d.addCallback(cb)
-            d.addCallback(lambda dummy: log.info(_("All microblog's main items from %s have been deleted!") % jid_.userhost()))
+            d.addCallback(lambda dummy: log.info(_(u"All microblog's main items from %s have been deleted!") % jid_.userhost()))
             return d
 
         return self._initialise(profile_key).addCallback(initialised)
@@ -797,7 +797,7 @@
                 main_node = self.getNodeName(jid_)
                 d = self.host.plugins["XEP-0060"].getItems(service, main_node, profile_key=profile)
                 d.addCallback(lambda res: getComments(res[0], client))
-                d.addErrback(lambda failure, main_node: log.error(_("Retrieval of items for node %(node)s failed: %(message)s") %
+                d.addErrback(lambda failure, main_node: log.error(_(u"Retrieval of items for node %(node)s failed: %(message)s") %
                                                               {'node': main_node, 'message': failure.getErrorMessage()}), main_node)
                 blogs.append(d)
 
@@ -820,7 +820,7 @@
                 service, node = self.host.plugins['XEP-0277'].parseCommentUrl(href)
                 d = self.host.plugins["XEP-0060"].getItems(service, node, profile_key=profile_key)
                 d.addCallback(lambda items: (service, node, items[0]))
-                d.addErrback(lambda failure, node: log.error(_("Retrieval of comments for node %(node)s failed: %(message)s") %
+                d.addErrback(lambda failure, node: log.error(_(u"Retrieval of comments for node %(node)s failed: %(message)s") %
                                                          {'node': node, 'message': failure.getErrorMessage()}), node)
                 comments.append(d)
             dlist = defer.DeferredList(comments)
@@ -852,9 +852,9 @@
                 deletions = []
                 if item_ids:  # remove the comments of the user on the given post
                     d = self.host.plugins['XEP-0060'].retractItems(service, node_id, item_ids, profile_key=profile_key)
-                    d.addCallback(lambda dummy, node_id: log.debug(_('Comments of user %(user)s in node %(node)s have been retracted') %
+                    d.addCallback(lambda dummy, node_id: log.debug(_(u'Comments of user %(user)s in node %(node)s have been retracted') %
                                                       {'user': user_jid_s, 'node': node_id}), node_id)
-                    d.addErrback(lambda failure, node_id: log.error(_("Retraction of comments from %(user)s in node %(node)s failed: %(message)s") %
+                    d.addErrback(lambda failure, node_id: log.error(_(u"Retraction of comments from %(user)s in node %(node)s failed: %(message)s") %
                                                        {'user': user_jid_s, 'node': node_id, 'message': failure.getErrorMessage()}), node_id)
                     deletions.append(d)
             return defer.DeferredList(deletions)