diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-16 20:13:35 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-16 20:13:35 -0700 |
| commit | 78f03253983779673beaf3c102ae315707a49d2c (patch) | |
| tree | dd5c031b2fc96c88e3d03b7f21cb275ef937398c /sleekxmpp/plugins/xep_0030/static.py | |
| parent | 1efe04995941933e7579efffd8f325d8c4b516ef (diff) | |
| parent | f6edaa56a6e91f7104cd63e5d48b39d4ca7e09f2 (diff) | |
| download | slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.gz slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.bz2 slixmpp-78f03253983779673beaf3c102ae315707a49d2c.tar.xz slixmpp-78f03253983779673beaf3c102ae315707a49d2c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/static.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0030/static.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0030/static.py b/sleekxmpp/plugins/xep_0030/static.py index 8dd412d4..dd5317d1 100644 --- a/sleekxmpp/plugins/xep_0030/static.py +++ b/sleekxmpp/plugins/xep_0030/static.py @@ -237,7 +237,7 @@ class StaticDisco(object): with self.lock: if not self.node_exists(jid, node): if not node: - return DiscoInfo() + return DiscoItems() else: raise XMPPError(condition='item-not-found') else: @@ -424,9 +424,6 @@ class StaticDisco(object): The data parameter is not used. """ with self.lock: - if isinstance(jid, JID): - jid = jid.full - if not self.node_exists(jid, node, ifrom): return None else: |