From 2273421745817cd2dcc539b0e72b99e787f82ca6 Mon Sep 17 00:00:00 2001 From: souliane Date: Fri, 24 Apr 2015 14:54:24 +0200 Subject: [PATCH] core (xmpp): RosterItem.jid is deprecated in Wokkel 0.7.1, use RosterItem.entity instead --- src/core/xmpp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/xmpp.py b/src/core/xmpp.py index fb9f5d79..59f31e71 100644 --- a/src/core/xmpp.py +++ b/src/core/xmpp.py @@ -187,7 +187,7 @@ class SatRosterProtocol(xmppim.RosterClientProtocol): #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 @@ class SatRosterProtocol(xmppim.RosterClientProtocol): 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 @@ class SatRosterProtocol(xmppim.RosterClientProtocol): 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