diff options
| author | Link Mauve <linkmauve@linkmauve.fr> | 2019-08-01 22:30:58 +0200 |
|---|---|---|
| committer | Link Mauve <linkmauve@linkmauve.fr> | 2019-08-01 22:30:58 +0200 |
| commit | bec6f7c8f330145fb472ad917f3cb1e78697f2e0 (patch) | |
| tree | c294b13188a65c2a5d81093b4f14e4696f8859a5 | |
| parent | d57fbb57a227a083370854259d15154a950e0c86 (diff) | |
| parent | 027ce2434d7fd3cf4a286dd373cb761c0d114c66 (diff) | |
| download | slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.gz slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.bz2 slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.tar.xz slixmpp-bec6f7c8f330145fb472ad917f3cb1e78697f2e0.zip | |
Merge branch 'mam' into 'master'
Removed 'block' from set_preferences as it was giving a TypeError while sending the staza.
See merge request poezio/slixmpp!20
| -rw-r--r-- | slixmpp/plugins/xep_0313/mam.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slixmpp/plugins/xep_0313/mam.py b/slixmpp/plugins/xep_0313/mam.py index 8e92bc2b..f78b62fa 100644 --- a/slixmpp/plugins/xep_0313/mam.py +++ b/slixmpp/plugins/xep_0313/mam.py @@ -98,7 +98,7 @@ class XEP_0313(BasePlugin): return iq.send(timeout=timeout, callback=callback) def set_preferences(self, jid=None, default=None, always=None, never=None, - ifrom=None, block=True, timeout=None, callback=None): + ifrom=None, timeout=None, callback=None): iq = self.xmpp.Iq() iq['type'] = 'set' iq['to'] = jid @@ -106,7 +106,7 @@ class XEP_0313(BasePlugin): iq['mam_prefs']['default'] = default iq['mam_prefs']['always'] = always iq['mam_prefs']['never'] = never - return iq.send(block=block, timeout=timeout, callback=callback) + return iq.send(timeout=timeout, callback=callback) def get_configuration_commands(self, jid, **kwargs): return self.xmpp['xep_0030'].get_items( |