summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030/static.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
committerLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
commitf89df6e70cee5840dbdbf41e68ae7d2384814373 (patch)
treedff0d3315c117ecba12fdc2837dd3ed6fad01b86 /sleekxmpp/plugins/xep_0030/static.py
parent250d28e870b63576e09dd1288b05394808518369 (diff)
parent0e36a0135407ea9a274517c7cfd5fe32eda0491f (diff)
downloadslixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.gz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.bz2
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.xz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/static.py')
-rw-r--r--sleekxmpp/plugins/xep_0030/static.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/sleekxmpp/plugins/xep_0030/static.py b/sleekxmpp/plugins/xep_0030/static.py
index 7306461a..8dd412d4 100644
--- a/sleekxmpp/plugins/xep_0030/static.py
+++ b/sleekxmpp/plugins/xep_0030/static.py
@@ -182,11 +182,6 @@ class StaticDisco(object):
data = {'local': data.get('local', False),
'cached': data.get('cached', True)}
- if node in (None, ''):
- info = self.caps.get_caps(jid)
- if info and identity in info['identities']:
- return True
-
try:
info = self.disco.get_info(jid=jid, node=node,
ifrom=ifrom, **data)