diff options
author | Mike Taylor <bear42@gmail.com> | 2015-07-03 15:07:35 -0400 |
---|---|---|
committer | Mike Taylor <bear42@gmail.com> | 2015-07-03 15:07:35 -0400 |
commit | c024ac8f0b58d114d72660a1967f1632546606ed (patch) | |
tree | 5d1bb0dba79c46000fe2d4603ace49ddd6cc0c96 /sleekxmpp/clientxmpp.py | |
parent | a8ac115310c1b9aaa80cc0d48a1157396b29abd3 (diff) | |
parent | f00177c0cf5512a86b37ba69fc627ddf92abdc6b (diff) | |
download | slixmpp-c024ac8f0b58d114d72660a1967f1632546606ed.tar.gz slixmpp-c024ac8f0b58d114d72660a1967f1632546606ed.tar.bz2 slixmpp-c024ac8f0b58d114d72660a1967f1632546606ed.tar.xz slixmpp-c024ac8f0b58d114d72660a1967f1632546606ed.zip |
Merge pull request #382 from sangeeths/initialize_certificate
Initialize certfile, keyfile and ca_certs in XMLStream. Added **kwargs to ClientXMPP, BaseXMPP and XMLStream.
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
-rw-r--r-- | sleekxmpp/clientxmpp.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 8db6ef17..31a5a70b 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -59,14 +59,15 @@ class ClientXMPP(BaseXMPP): :param escape_quotes: **Deprecated.** """ - def __init__(self, jid, password, plugin_config=None, plugin_whitelist=None, escape_quotes=True, sasl_mech=None, - lang='en'): + def __init__(self, jid, password, plugin_config=None, + plugin_whitelist=None, escape_quotes=True, sasl_mech=None, + lang='en', **kwargs): if not plugin_whitelist: plugin_whitelist = [] if not plugin_config: plugin_config = {} - BaseXMPP.__init__(self, jid, 'jabber:client') + BaseXMPP.__init__(self, jid, 'jabber:client', **kwargs) self.escape_quotes = escape_quotes self.plugin_config = plugin_config |