Merge branch 'master' into develop

2012-06-13 09:27:47 -07:00
parent 250d28e870 0e36a01354
commit f89df6e70c
4 changed files with 7 additions and 11 deletions
--- 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)