summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorSangeeth Saravanaraj <sangeeth@riptideio.com>2015-07-03 10:47:06 +0530
committerSangeeth Saravanaraj <sangeeth@riptideio.com>2015-07-03 10:47:06 +0530
commitf00177c0cf5512a86b37ba69fc627ddf92abdc6b (patch)
tree5d1bb0dba79c46000fe2d4603ace49ddd6cc0c96 /sleekxmpp/xmlstream/xmlstream.py
parent9b25a7cf77b969a2cc923773855cb482c314b511 (diff)
downloadslixmpp-f00177c0cf5512a86b37ba69fc627ddf92abdc6b.tar.gz
slixmpp-f00177c0cf5512a86b37ba69fc627ddf92abdc6b.tar.bz2
slixmpp-f00177c0cf5512a86b37ba69fc627ddf92abdc6b.tar.xz
slixmpp-f00177c0cf5512a86b37ba69fc627ddf92abdc6b.zip
Added **kwargs to ClientXMPP, BaseXMPP and XMLStream so that certfile, keyfile and ca_certs can be initialized.
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index f9ec4947..62d46100 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -114,7 +114,8 @@ class XMLStream(object):
:param int port: The port to use for the connection. Defaults to 0.
"""
- def __init__(self, socket=None, host='', port=0):
+ def __init__(self, socket=None, host='', port=0, certfile=None,
+ keyfile=None, ca_certs=None, **kwargs):
#: Most XMPP servers support TLSv1, but OpenFire in particular
#: does not work well with it. For OpenFire, set
#: :attr:`ssl_version` to use ``SSLv23``::
@@ -136,16 +137,16 @@ class XMLStream(object):
#:
#: On Mac OS X, certificates in the system keyring will
#: be consulted, even if they are not in the provided file.
- self.ca_certs = None
+ self.ca_certs = ca_certs
#: Path to a file containing a client certificate to use for
#: authenticating via SASL EXTERNAL. If set, there must also
#: be a corresponding `:attr:keyfile` value.
- self.certfile = None
+ self.certfile = certfile
#: Path to a file containing the private key for the selected
#: client certificate to use for authenticating via SASL EXTERNAL.
- self.keyfile = None
+ self.keyfile = keyfile
self._der_cert = None