jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix components

Browse Source 
(use_tls is useless since slixmpp will always try to use starttls
whenever possible)
This commit is contained in:
mathieui 2015-07-21 00:33:15 +02:00
parent d0ad25745a
commit 84eddd2ed2
No known key found for this signature in database
GPG Key ID: C59F84CEEFD616E3
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slixmpp/clientxmpp.py
View File

@ -135,8 +135,6 @@ 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 reattempt: If ``True``, repeat attempting to connect if an
error occurs. Defaults to ``True``.
:param use_tls: Indicates if TLS should be used for the :param use_tls: Indicates if TLS should be used for the
connection. Defaults to ``True``. connection. Defaults to ``True``.
:param use_ssl: Indicates if the older SSL connection method :param use_ssl: Indicates if the older SSL connection method

17
slixmpp/componentxmpp.py
View File

@ -77,12 +77,9 @@ class ComponentXMPP(BaseXMPP):
self.add_event_handler('presence_probe', self.add_event_handler('presence_probe',
self._handle_probe) self._handle_probe)
def connect(self, host=None, port=None, use_ssl=False, def connect(self, host=None, port=None, use_ssl=False):
use_tls=False, reattempt=True):
"""Connect to the server. """Connect to the server.
Setting ``reattempt`` to ``True`` will cause connection attempts to
be made every second until a successful connection is established.
:param host: The name of the desired server for the connection. :param host: The name of the desired server for the connection.
Defaults to :attr:`server_host`. Defaults to :attr:`server_host`.
@ -90,11 +87,6 @@ class ComponentXMPP(BaseXMPP):
Defauts to :attr:`server_port`. Defauts to :attr:`server_port`.
:param use_ssl: Flag indicating if SSL should be used by connecting :param use_ssl: Flag indicating if SSL should be used by connecting
directly to a port using SSL. directly to a port using SSL.
:param use_tls: Flag indicating if TLS should be used, allowing for
connecting to a port without using SSL immediately and
later upgrading the connection.
:param reattempt: Flag indicating if the socket should reconnect
after disconnections.
""" """
if host is None: if host is None:
host = self.server_host host = self.server_host
@ -103,14 +95,9 @@ class ComponentXMPP(BaseXMPP):
self.server_name = self.boundjid.host self.server_name = self.boundjid.host
if use_tls:
log.info("XEP-0114 components can not use TLS")
log.debug("Connecting to %s:%s", host, port) log.debug("Connecting to %s:%s", host, port)
return XMLStream.connect(self, host=host, port=port, return XMLStream.connect(self, host=host, port=port,
use_ssl=use_ssl, use_ssl=use_ssl)
use_tls=False,
reattempt=reattempt)
def incoming_filter(self, xml): def incoming_filter(self, xml):
""" """