changeset 2688b908138c in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2688b908138c description: fix connecting with python3 internal ssl implementation

diffstat:

src/common/connection.py | 2 +- src/common/connection_handlers_events.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6ddfd952427e -r 2688b908138c src/common/connection.py --- a/src/common/connection.py Sun Jan 06 15:41:26 2013 +0400 +++ b/src/common/connection.py Sun Jan 06 13:47:23 2013 +0100 @@ -1326,7 +1326,7 @@ certificate=con.Connection.ssl_certificate[i])) return True i += 1 - if hasattr(con.Connection, 'ssl_fingerprint_sha1'): + if len(con.Connection.ssl_fingerprint_sha1): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: diff -r 6ddfd952427e -r 2688b908138c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 06 15:41:26 2013 +0400 +++ b/src/common/connection_handlers_events.py Sun Jan 06 13:47:23 2013 +0100 @@ -1568,10 +1568,10 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ er) self.ssl_cert = '' - if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): + if len(self.conn.connection.Connection.ssl_cert_pem): self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' - if hasattr(self.conn.connection.Connection, 'ssl_fingerprint_sha1'): + if len(self.conn.connection.Connection.ssl_fingerprint_sha1): self.ssl_fingerprint = \ self.conn.connection.Connection.ssl_fingerprint_sha1 return True