Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gajim
gajim
Commits
4e1a9db6
Commit
4e1a9db6
authored
Mar 24, 2018
by
Philipp Hörist
Browse files
Remove conditional code for nbxmpp < 0.6.3
parent
b3e6170e
Changes
1
Hide whitespace changes
Inline
Side-by-side
gajim/common/connection.py
View file @
4e1a9db6
...
...
@@ -1218,17 +1218,11 @@ def _connect_to_next_host(self, retry=False):
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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment