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

py2 -> py3

Browse source
This commit is contained in:
Yann Leboulanger 2013-12-30 20:56:09 +01:00
parent 66c9ecd6cf
commit 54c3f9acaa
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/connection.py
View file

@ -1395,15 +1395,15 @@ class Connection(CommonConnection, ConnectionHandlers):
text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum]
else: else:
text += _('\nUnknown SSL error: %d') % errnum text += _('\nUnknown SSL error: %d') % errnum
fingerprint = cert.digest('sha1') fingerprint = cert.digest('sha1').decode('utf-8')
pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM,
cert) cert).decode('utf-8')
gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self,
error_text=text, error_num=errnum, cert=pem, error_text=text, error_num=errnum, cert=pem,
fingerprint=fingerprint, certificate=cert)) fingerprint=fingerprint, certificate=cert))
return True return True
if cert: if cert:
fingerprint = cert.digest('sha1') fingerprint = cert.digest('sha1').decode('utf-8')
saved_fingerprint = gajim.config.get_per('accounts', self.name, saved_fingerprint = gajim.config.get_per('accounts', self.name,
'ssl_fingerprint_sha1') 'ssl_fingerprint_sha1')
if saved_fingerprint: if saved_fingerprint:
@ -1420,7 +1420,7 @@ class Connection(CommonConnection, ConnectionHandlers):
'100' not in gajim.config.get_per('accounts', self.name, '100' not in gajim.config.get_per('accounts', self.name,
'ignore_ssl_errors').split(): 'ignore_ssl_errors').split():
pem = OpenSSL.crypto.dump_certificate( pem = OpenSSL.crypto.dump_certificate(
OpenSSL.crypto.FILETYPE_PEM, cert) OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8')
txt = _('The authenticity of the %s certificate could be ' txt = _('The authenticity of the %s certificate could be '
'invalid.\nThe certificate does not cover this domain.') %\ 'invalid.\nThe certificate does not cover this domain.') %\
hostname hostname

4
src/common/connection_handlers_events.py
View file

@ -1639,8 +1639,8 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent):
if self.conn.connection.Connection.ssl_certificate: if self.conn.connection.Connection.ssl_certificate:
cert = self.conn.connection.Connection.ssl_certificate cert = self.conn.connection.Connection.ssl_certificate
self.ssl_cert = OpenSSL.crypto.dump_certificate( self.ssl_cert = OpenSSL.crypto.dump_certificate(
OpenSSL.crypto.FILETYPE_PEM, cert) OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8')
self.ssl_fingerprint = cert.digest('sha1') self.ssl_fingerprint = cert.digest('sha1').decode('utf-8')
return True return True
class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent):

3
src/common/jingle_xtls.py
View file

@ -289,7 +289,8 @@ def make_certs(filepath, CN):
os.chmod(filepath + '.pkey', 0600) os.chmod(filepath + '.pkey', 0600)
f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key))
with open(filepath + '.cert', 'wb') as f: with open(filepath + '.cert', 'wb') as f:
f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode(
'utf-8'))
if __name__ == '__main__': if __name__ == '__main__':

4
src/gajim.py
View file

@ -71,10 +71,10 @@ except ImportError:
try: try:
from distutils.version import LooseVersion as V from distutils.version import LooseVersion as V
if V(nbxmpp.__version__) < V("0.3"): if V(nbxmpp.__version__) < V("0.3"):
print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' print('Gajim needs python-nbxmpp > 0.3 to run. Quiting...')
sys.exit() sys.exit()
except: except:
print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' print('Gajim needs python-nbxmpp > 0.3 to run. Quiting...')
sys.exit() sys.exit()
#from common import demandimport #from common import demandimport