From f7a74d960edb3ced00423c081ec74e9e91f3aea2 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 19 Jun 2012 00:06:31 -0700 Subject: Simplify send_presence_subscription() --- sleekxmpp/basexmpp.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 099b6dd0..576cfe87 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -551,14 +551,10 @@ class BaseXMPP(XMLStream): :param ptype: The type of presence, such as ``'subscribe'``. :param pnick: Optional nickname of the presence's sender. """ - presence = self.makePresence(ptype=ptype, - pfrom=pfrom, - pto=self.getjidbare(pto)) - if pnick: - nick = ET.Element('{http://jabber.org/protocol/nick}nick') - nick.text = pnick - presence.append(nick) - presence.send() + self.make_presence(ptype=ptype, + pfrom=pfrom, + pto=JID(pto).bare, + pnick=pnick).send() @property def jid(self): -- cgit v1.2.3