summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0257/client_cert_management.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-09-04 01:05:56 +0200
committermathieui <mathieui@mathieui.net>2015-09-04 01:05:56 +0200
commit00a069872054b79fec1e29172df995e065485585 (patch)
tree63ba1062ade9bb2e1bfc0a9eaa1ecef32246f032 /slixmpp/plugins/xep_0257/client_cert_management.py
parent804b23d390fe5733f4f2cbd1b588fbc9b7c42e21 (diff)
downloadslixmpp-00a069872054b79fec1e29172df995e065485585.tar.gz
slixmpp-00a069872054b79fec1e29172df995e065485585.tar.bz2
slixmpp-00a069872054b79fec1e29172df995e065485585.tar.xz
slixmpp-00a069872054b79fec1e29172df995e065485585.zip
Add timeout_callback to a bunch of plugins as a parameter
Diffstat (limited to 'slixmpp/plugins/xep_0257/client_cert_management.py')
-rw-r--r--slixmpp/plugins/xep_0257/client_cert_management.py25
1 files changed, 15 insertions, 10 deletions
diff --git a/slixmpp/plugins/xep_0257/client_cert_management.py b/slixmpp/plugins/xep_0257/client_cert_management.py
index 729197e0..a6d07506 100644
--- a/slixmpp/plugins/xep_0257/client_cert_management.py
+++ b/slixmpp/plugins/xep_0257/client_cert_management.py
@@ -31,35 +31,40 @@ class XEP_0257(BasePlugin):
register_stanza_plugin(Iq, DisableCert)
register_stanza_plugin(Iq, RevokeCert)
- def get_certs(self, ifrom=None, timeout=None, callback=None):
+ def get_certs(self, ifrom=None, timeout=None, callback=None,
+ timeout_callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'get'
iq['from'] = ifrom
iq.enable('sasl_certs')
- return iq.send(timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback,
+ timeout_callback=timeout_callback)
def add_cert(self, name, cert, allow_management=True, ifrom=None,
- timeout=None, callback=None):
+ timeout=None, callback=None, timeout_callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['from'] = ifrom
iq['sasl_cert_append']['name'] = name
iq['sasl_cert_append']['x509cert'] = cert
iq['sasl_cert_append']['cert_management'] = allow_management
- return iq.send(timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback,
+ timeout_callback=timeout_callback)
- def disable_cert(self, name, ifrom=None,
- timeout=None, callback=None):
+ def disable_cert(self, name, ifrom=None, timeout=None, callback=None,
+ timeout_callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['from'] = ifrom
iq['sasl_cert_disable']['name'] = name
- return iq.send(timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback,
+ timeout_callback=timeout_callback)
- def revoke_cert(self, name, ifrom=None,
- timeout=None, callback=None):
+ def revoke_cert(self, name, ifrom=None, timeout=None, callback=None,
+ timeout_callback=None):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['from'] = ifrom
iq['sasl_cert_revoke']['name'] = name
- return iq.send(timeout=timeout, callback=callback)
+ return iq.send(timeout=timeout, callback=callback,
+ timeout_callback=timeout_callback)