diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-11 16:39:55 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-11 16:39:55 -0800 |
| commit | c0074f95b160f4766168ed2cae955709bf38d124 (patch) | |
| tree | a81d265d3aedb235d65be59f1fdea173c42818cd /sleekxmpp/plugins/xep_0030/disco.py | |
| parent | a79ce1c35e041c168af72f051829c5576713a186 (diff) | |
| download | slixmpp-c0074f95b160f4766168ed2cae955709bf38d124.tar.gz slixmpp-c0074f95b160f4766168ed2cae955709bf38d124.tar.bz2 slixmpp-c0074f95b160f4766168ed2cae955709bf38d124.tar.xz slixmpp-c0074f95b160f4766168ed2cae955709bf38d124.zip | |
update_caps() can now do presence broadcasting.
As part of adding this feature:
- fixed bug in update_caps() not assigning verstrings
- fixed xep_0004 typo
- can now use None as a roster key which will map to boundjid.bare
- fixed using JID objects in disco node handlers
- fixed failing test related to get_roster
Several of these bugs I've fixed before, so I either didn't push them
earlier, or I clobbered something when merging. *shrug*
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0030/disco.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py index 10f9ef4e..58f4f20c 100644 --- a/sleekxmpp/plugins/xep_0030/disco.py +++ b/sleekxmpp/plugins/xep_0030/disco.py @@ -357,6 +357,7 @@ class xep_0030(base_plugin): else: if str(jid) == str(self.xmpp.boundjid): local = True + jid = jid.full if local or jid in (None, ''): log.debug("Looking up local disco#info data " + \ @@ -626,6 +627,9 @@ class xep_0030(base_plugin): node -- The node requested. data -- Optional, custom data to pass to the handler. """ + if isinstance(jid, JID): + jid = jid.full + if jid in (None, ''): if self.xmpp.is_component: jid = self.xmpp.boundjid.full |