diff options
| author | mathieui <mathieui@mathieui.net> | 2015-07-21 00:33:15 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-07-21 00:33:15 +0200 |
| commit | 84eddd2ed282e13d1550527e6c66eae7ea4dc9bf (patch) | |
| tree | 0aa246c3147eb0596ca1f3dca3e711bb12f22b60 | |
| parent | d0ad25745a81df3f49a96bee376f9d60f490bd0f (diff) | |
| download | slixmpp-84eddd2ed282e13d1550527e6c66eae7ea4dc9bf.tar.gz slixmpp-84eddd2ed282e13d1550527e6c66eae7ea4dc9bf.tar.bz2 slixmpp-84eddd2ed282e13d1550527e6c66eae7ea4dc9bf.tar.xz slixmpp-84eddd2ed282e13d1550527e6c66eae7ea4dc9bf.zip | |
Fix components
(use_tls is useless since slixmpp will always try to use starttls
whenever possible)
| -rw-r--r-- | slixmpp/clientxmpp.py | 2 | ||||
| -rw-r--r-- | slixmpp/componentxmpp.py | 17 |
2 files changed, 2 insertions, 17 deletions
diff --git a/slixmpp/clientxmpp.py b/slixmpp/clientxmpp.py index 9659c308..d1fd65a9 100644 --- a/slixmpp/clientxmpp.py +++ b/slixmpp/clientxmpp.py @@ -135,8 +135,6 @@ class ClientXMPP(BaseXMPP): will be used. :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 connection. Defaults to ``True``. :param use_ssl: Indicates if the older SSL connection method diff --git a/slixmpp/componentxmpp.py b/slixmpp/componentxmpp.py index b4e4f52c..68669c06 100644 --- a/slixmpp/componentxmpp.py +++ b/slixmpp/componentxmpp.py @@ -77,12 +77,9 @@ class ComponentXMPP(BaseXMPP): self.add_event_handler('presence_probe', self._handle_probe) - def connect(self, host=None, port=None, use_ssl=False, - use_tls=False, reattempt=True): + def connect(self, host=None, port=None, use_ssl=False): """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. Defaults to :attr:`server_host`. @@ -90,11 +87,6 @@ class ComponentXMPP(BaseXMPP): Defauts to :attr:`server_port`. :param use_ssl: Flag indicating if SSL should be used by connecting 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: host = self.server_host @@ -103,14 +95,9 @@ class ComponentXMPP(BaseXMPP): 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) return XMLStream.connect(self, host=host, port=port, - use_ssl=use_ssl, - use_tls=False, - reattempt=reattempt) + use_ssl=use_ssl) def incoming_filter(self, xml): """ |