[Git][gajim/gajim][master] Remove conditional code for nbxmpp < 0.6.3

[Philipp Hörist]

Philipp Hörist pushed to branch master at gajim / gajim


Commits:
4e1a9db6 by Philipp Hörist at 2018-03-24T00:19:27+01:00
Remove conditional code for nbxmpp < 0.6.3

- - - - -


1 changed file:

- gajim/common/connection.py


Changes:

=====================================
gajim/common/connection.py
=====================================
--- 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')
-
-        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)
+        tls_version = app.config.get_per('accounts', self.name, 'tls_version')
+        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'])
 
         con = nbxmpp.NonBlockingClient(
             domain=self._hostname,



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/4e1a9db6ccd71d095520a74ed1f603099d4cb7ee

---
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/4e1a9db6ccd71d095520a74ed1f603099d4cb7ee
You're receiving this email because of your account on dev.gajim.org.

_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits