From 4e1a9db6ccd71d095520a74ed1f603099d4cb7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 24 Mar 2018 00:19:27 +0100 Subject: [PATCH] Remove conditional code for nbxmpp < 0.6.3 --- gajim/common/connection.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gajim/common/connection.py b/gajim/common/connection.py index 1778b5db8..17feaa799 100644 --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1218,17 +1218,11 @@ class Connection(CommonConnection, ConnectionHandlers): if os.name == 'nt': cacerts = certifi.where() mycerts = common.app.MY_CACERTS - tls_version = app.config.get_per('accounts', self.name, - 'tls_version') - cipher_list = app.config.get_per('accounts', self.name, - 'cipher_list') + tls_version = app.config.get_per('accounts', self.name, 'tls_version') + cipher_list = app.config.get_per('accounts', self.name, 'cipher_list') - 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) + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, + cipher_list, self._current_host['alpn']) con = nbxmpp.NonBlockingClient( domain=self._hostname,