pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'doc_fixes' of https://github.com/SamWhited/slixmpp

Browse source
This commit is contained in:
mathieui 2016-09-30 20:53:36 +02:00
commit e4696e0471
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
slixmpp/clientxmpp.py
View file

@ -141,8 +141,11 @@ class ClientXMPP(BaseXMPP):
will be used. will be used.
:param address: A tuple containing the server's host and port. :param address: A tuple containing the server's host and port.
:param use_tls: Indicates if TLS should be used for the :param force_starttls: Indicates that negotiation should be aborted
connection. Defaults to ``True``. if the server does not advertise support for
STARTTLS. Defaults to ``True``.
:param disable_starttls: Disables TLS for the connection.
Defaults to ``False``.
:param use_ssl: Indicates if the older SSL connection method :param use_ssl: Indicates if the older SSL connection method
should be used. Defaults to ``False``. should be used. Defaults to ``False``.
""" """

4
slixmpp/xmlstream/xmlstream.py
View file

@ -256,9 +256,9 @@ class XMLStream(asyncio.BaseProtocol):
TODO fix the comment TODO fix the comment
:param force_starttls: If True, the connection will be aborted if :param force_starttls: If True, the connection will be aborted if
the server does not initiate a STARTTLS the server does not initiate a STARTTLS
negociation. If None, the connection will be negotiation. If None, the connection will be
upgraded to TLS only if the server initiate upgraded to TLS only if the server initiate
the STARTTLS negociation, otherwise it will the STARTTLS negotiation, otherwise it will
connect in clear. If False it will never connect in clear. If False it will never
upgrade to TLS, even if the server provides upgrade to TLS, even if the server provides
it. Use this for example if you’re on it. Use this for example if you’re on