Commits February 2013

commits@gajim.org

3 participants
86 discussions

python-nbxmpp: don't crash when cacerts is an empty string
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset 675173fbd348 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=675173fbd348 description: don't crash when cacerts is an empty string diffstat: nbxmpp/tls_nb.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (19 lines): diff -r 59d5ea67c78f -r 675173fbd348 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Feb 09 21:44:15 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Feb 10 11:28:44 2013 +0100 @@ -399,13 +399,9 @@ tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, - self._ssl_verify_callback) - try: - tcpsock._sslContext.load_verify_locations(self.cacerts) - except: - log.warning('Unable to load SSL certificates from file %s' % \ - os.path.abspath(self.cacerts)) + self._ssl_verify_callback) store = tcpsock._sslContext.get_cert_store() + self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) if os.path.isdir('/etc/ssl/certs'): for f in os.listdir('/etc/ssl/certs'):

1 0

python-nbxmpp: fix traceback
by Yann Leboulanger 09 Feb '13

09 Feb '13

changeset 59d5ea67c78f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=59d5ea67c78f description: fix traceback diffstat: nbxmpp/idlequeue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 562d1f70f8d9 -r 59d5ea67c78f nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sat Feb 09 21:43:30 2013 +0100 +++ b/nbxmpp/idlequeue.py Sat Feb 09 21:44:15 2013 +0100 @@ -311,7 +311,7 @@ if fd not in self.queue: self.remove_timeout(fd) continue - for timeout, func in timeouts.items(): + for timeout, func in list(timeouts.items()): if timeout > current_time: continue if func:

1 0

python-nbxmpp: fix handling traceback. Fixes #3
by Yann Leboulanger 09 Feb '13

09 Feb '13

changeset 562d1f70f8d9 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=562d1f70f8d9 description: fix handling traceback. Fixes #3 diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 515773a7d189 -r 562d1f70f8d9 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Fri Feb 08 08:47:31 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 09 21:43:30 2013 +0100 @@ -361,7 +361,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.args + errnum, errstr = e.errno, e.strerror if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress

1 0

python-nbxmpp: basestring -> str
by Yann Leboulanger 08 Feb '13

08 Feb '13

changeset 515773a7d189 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=515773a7d189 description: basestring -> str diffstat: nbxmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 49651c7be6d7 -r 515773a7d189 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Feb 08 08:45:22 2013 +0100 +++ b/nbxmpp/tls_nb.py Fri Feb 08 08:47:31 2013 +0100 @@ -70,7 +70,7 @@ errno = errno or gattr(exc, 'errno') or exc.args[0] strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args') - if not isinstance(strerror, basestring): + if not isinstance(strerror, str): strerror = repr(strerror) self.sock = sock @@ -99,7 +99,7 @@ if self.peer is None and sock is not None: try: ppeer = self.sock.getpeername() - if len(ppeer) == 2 and isinstance(ppeer[0], basestring) \ + if len(ppeer) == 2 and isinstance(ppeer[0], str) \ and isinstance(ppeer[1], int): self.peer = ppeer except:

1 0

python-nbxmpp: fix error handling. Fixes #1
by Yann Leboulanger 08 Feb '13

08 Feb '13

changeset 49651c7be6d7 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=49651c7be6d7 description: fix error handling. Fixes #1 diffstat: nbxmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7afc8a41b96b -r 49651c7be6d7 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Jan 20 19:52:22 2013 +0100 +++ b/nbxmpp/tls_nb.py Fri Feb 08 08:45:22 2013 +0100 @@ -68,7 +68,7 @@ peer=None): self.parent = IOError - errno = errno or gattr(exc, 'errno') or exc[0] + errno = errno or gattr(exc, 'errno') or exc.args[0] strerror = strerror or gattr(exc, 'strerror') or gattr(exc, 'args') if not isinstance(strerror, basestring): strerror = repr(strerror)

1 0

gajim: prevent tb.
by Denis Fomin 05 Feb '13

05 Feb '13

changeset 3f8001c9d5c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3f8001c9d5c1 description: prevent tb. diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d5098768ad37 -r 3f8001c9d5c1 src/roster_window.py --- a/src/roster_window.py Thu Jan 31 14:05:51 2013 +0400 +++ b/src/roster_window.py Tue Feb 05 13:22:03 2013 +0400 @@ -2640,6 +2640,8 @@ contact = \ gajim.contacts.get_contact_with_highest_priority( account, jid) + if not contact: + continue gajim.interface.on_open_chat_window(None, contact, account) gajim.config.set_per('accounts', account,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013