Commit 4e1a9db6 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Remove conditional code for nbxmpp < 0.6.3

parent b3e6170e
...@@ -1218,17 +1218,11 @@ def _connect_to_next_host(self, retry=False): ...@@ -1218,17 +1218,11 @@ def _connect_to_next_host(self, retry=False):
if os.name == 'nt': if os.name == 'nt':
cacerts = certifi.where() cacerts = certifi.where()
mycerts = common.app.MY_CACERTS mycerts = common.app.MY_CACERTS
tls_version = app.config.get_per('accounts', self.name, tls_version = app.config.get_per('accounts', self.name, 'tls_version')
'tls_version') cipher_list = app.config.get_per('accounts', self.name, 'cipher_list')
cipher_list = app.config.get_per('accounts', self.name,
'cipher_list') secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
cipher_list, self._current_host['alpn'])
if version_condition(nbxmpp.__version__, '0.6.3'):
secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
cipher_list, self._current_host['alpn'])
else:
secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
cipher_list)
con = nbxmpp.NonBlockingClient( con = nbxmpp.NonBlockingClient(
domain=self._hostname, domain=self._hostname,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment