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

Fix missing returns, so we don't run into that assert.

This commit is contained in:
js 2009-01-10 22:46:26 +00:00
parent 15ab37043e
commit 6ede969f5f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/xmpp/client_nb.py
View File

@ -346,6 +346,7 @@ class NonBlockingClient:
if self.desired_security == 'plain': if self.desired_security == 'plain':
# if we want and have plain connection, we're done now # if we want and have plain connection, we're done now
self._on_connect() self._on_connect()
return
else: else:
# try to negotiate TLS # try to negotiate TLS
if self.incoming_stream_version() != '1.0': if self.incoming_stream_version() != '1.0':
@ -358,12 +359,15 @@ class NonBlockingClient:
self.stream_started = False self.stream_started = False
log.info('TLS supported by remote server. Requesting TLS start.') log.info('TLS supported by remote server. Requesting TLS start.')
self._tls_negotiation_handler() self._tls_negotiation_handler()
return
else: else:
log.warn('While connecting with type = "tls": TLS unsupported by remote server') log.warn('While connecting with type = "tls": TLS unsupported by remote server')
self._on_connect() self._on_connect()
return
elif self.connected in ['ssl', 'tls']: elif self.connected in ['ssl', 'tls']:
self._on_connect() self._on_connect()
return
assert False # should never be reached assert False # should never be reached
def _tls_negotiation_handler(self, con=None, tag=None): def _tls_negotiation_handler(self, con=None, tag=None):