From bea02c52c5c41e4cb49182c8bf972e340e00da2d Mon Sep 17 00:00:00 2001 From: jamesbunton Date: Mon, 17 Apr 2006 00:37:03 +0000 Subject: [PATCH] Hopefully fixed weird exception errors. git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@140 55fbd22a-6204-0410-b2f0-b6c764c7e90a committer: jamesbunton --- src/disco.py | 2 +- src/main.py | 2 +- src/tlib/msn/msnw.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/disco.py b/src/disco.py index 9e5c747..f9aac5b 100644 --- a/src/disco.py +++ b/src/disco.py @@ -70,7 +70,7 @@ class ServerDiscovery: Returns a deferred which will fire with the matching IQ response as it's sole argument. """ def checkDeferred(): if(not d.called): - d.errback() + d.errback("Timeout") del self.deferredIqs[(jid, ID)] jid = el.getAttribute("to") diff --git a/src/main.py b/src/main.py index 902ef79..4b4d906 100644 --- a/src/main.py +++ b/src/main.py @@ -7,7 +7,7 @@ sys.setdefaultencoding("utf-8") sys.stdout = codecs.lookup('utf-8')[-1](sys.stdout) # Find the best reactor -selectWarning = "Unable to install any good reactors (kqueue, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections +at a time." +selectWarning = "Unable to install any good reactors (kqueue, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections at a time." try: from twisted.internet import epollreactor as bestreactor except: diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py index 0b4f427..cc6774c 100644 --- a/src/tlib/msn/msnw.py +++ b/src/tlib/msn/msnw.py @@ -52,7 +52,7 @@ class MSNConnection: def timeout(): self.timeout = None if not d.called: - d.errback() + d.errback("Timeout") self.logOut() # Clean up everything self.timeout = reactor.callLater(30, timeout) dispatchFactory = msn.DispatchFactory() -- 2.39.2