summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorMike Taylor <bear42@gmail.com>2015-07-03 15:07:35 -0400
committerMike Taylor <bear42@gmail.com>2015-07-03 15:07:35 -0400
commitc024ac8f0b58d114d72660a1967f1632546606ed (patch)
tree5d1bb0dba79c46000fe2d4603ace49ddd6cc0c96 /sleekxmpp/basexmpp.py
parenta8ac115310c1b9aaa80cc0d48a1157396b29abd3 (diff)
parentf00177c0cf5512a86b37ba69fc627ddf92abdc6b (diff)
downloadslixmpp-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/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 8cd61b63..cb72b9bd 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -55,8 +55,8 @@ class BaseXMPP(XMLStream):
is used during initialization.
"""
- def __init__(self, jid='', default_ns='jabber:client'):
- XMLStream.__init__(self)
+ def __init__(self, jid='', default_ns='jabber:client', **kwargs):
+ XMLStream.__init__(self, **kwargs)
self.default_ns = default_ns
self.stream_ns = 'http://etherx.jabber.org/streams'