copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove conditional code for nbxmpp < 0.6.3

This commit is contained in:
Philipp Hörist 2018-03-24 00:19:27 +01:00
parent b3e6170e57
commit 4e1a9db6cc
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gajim/common/connection.py
View File

@ -1218,17 +1218,11 @@ class Connection(CommonConnection, ConnectionHandlers):
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')
if version_condition(nbxmpp.__version__, '0.6.3'): secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list, self._current_host['alpn'])
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,