diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-21 02:34:22 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-21 02:34:22 -0800 |
| commit | bad405bea96405eb952888dc6996b8b40be85ac4 (patch) | |
| tree | b5998707d5d8d836eaa807f1e755047c1aed5c48 /sleekxmpp/plugins/xep_0092/version.py | |
| parent | 648f3f978a84445ed188be055453ac4cab3ed4f5 (diff) | |
| parent | 4f9a95b011277ab64a137aceeb4df2e9fc0f1e25 (diff) | |
| download | slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.gz slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.bz2 slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.tar.xz slixmpp-bad405bea96405eb952888dc6996b8b40be85ac4.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0092/version.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0092/version.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sleekxmpp/plugins/xep_0092/version.py b/sleekxmpp/plugins/xep_0092/version.py index 35813e1d..b16ad516 100644 --- a/sleekxmpp/plugins/xep_0092/version.py +++ b/sleekxmpp/plugins/xep_0092/version.py @@ -70,7 +70,7 @@ class XEP_0092(BasePlugin): iq['software_version']['os'] = self.os iq.send() - def get_version(self, jid, ifrom=None): + def get_version(self, jid, ifrom=None, block=True, timeout=None, callback=None): """ Retrieve the software version of a remote agent. @@ -82,14 +82,4 @@ class XEP_0092(BasePlugin): iq['from'] = ifrom iq['type'] = 'get' iq['query'] = Version.namespace - - result = iq.send() - - if result and result['type'] != 'error': - values = result['software_version'].values - del values['lang'] - return values - return False - - -XEP_0092.getVersion = XEP_0092.get_version + return iq.send(block=block, timeout=timeout, callback=callback) |