Mercurial > libervia-backend

diff src/core/xmpp.py @ 1426:614145ef6e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core (xmpp): RosterItem.jid is deprecated in Wokkel 0.7.1, use RosterItem.entity instead
author souliane <souliane@mailoo.org>
date Fri, 24 Apr 2015 14:54:24 +0200
parents 176de79c8c39
children 1e833970b7f0
line wrap: on
line diff
--- a/src/core/xmpp.py	Thu Apr 23 15:16:06 2015 +0200
+++ b/src/core/xmpp.py	Fri Apr 24 14:54:24 2015 +0200
@@ -187,7 +187,7 @@
                 #XXX: current behaviour: we don't want contact in our roster list
                 # if there is no presence subscription
                 # may change in the future
-                self.removeItem(item.jid) # FIXME: to be checked
+                self.removeItem(item.entity) # FIXME: to be checked
             else:
                 self._registerItem(item)
 
@@ -197,16 +197,16 @@
         item must be already registered in self._jids before this method is called
         @param item (RosterIem): item added
         """
-        log.debug(u"registering item: {}".format(item.jid.full()))
+        log.debug(u"registering item: {}".format(item.entity.full()))
         if item.entity.resource:
             log.warning(u"Received a roster item with a resource, this is not common but not restricted by RFC 6121, this case may be not well tested.")
         if not item.subscriptionTo:
             if not item.subscriptionFrom:
-                log.info(_(u"There's no subscription between you and [{}]!").format(item.jid.full()))
+                log.info(_(u"There's no subscription between you and [{}]!").format(item.entity.full()))
             else:
-                log.info(_(u"You are not subscribed to [{}]!").format(item.jid.full()))
+                log.info(_(u"You are not subscribed to [{}]!").format(item.entity.full()))
         if not item.subscriptionFrom:
-            log.info(_(u"[{}] is not subscribed to you!").format(item.jid.full()))
+            log.info(_(u"[{}] is not subscribed to you!").format(item.entity.full()))
 
         for group in item.groups:
             self._groups.setdefault(group, set()).add(item.entity)
@@ -241,7 +241,7 @@
         item = request.item
         self._jids[item.entity] = item
         self._registerItem(item)
-        self.host.bridge.newContact(item.jid.full(), self.getAttributes(item), item.groups, self.parent.profile)
+        self.host.bridge.newContact(item.entity.full(), self.getAttributes(item), item.groups, self.parent.profile)
 
     def removeReceived(self, request):
         entity = request.item.entity