Hopefully fixed weird exception errors.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@140 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/disco.py b/src/disco.py
index 9e5c7471dff91a43ce69182dfa141f44e29594de..f9aac5b7e89208cf76f9d02d37a50b744fa37a13 100644 (file)
--- 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):
                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")
                                del self.deferredIqs[(jid, ID)]
 
                jid = el.getAttribute("to")

diff --git a/src/main.py b/src/main.py
index 902ef7927619f9bb54a21c71b18075517008d8a7..4b4d906022860449743b86ee76ba46884a9418f9 100644 (file)
--- 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
 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:
 try:
        from twisted.internet import epollreactor as bestreactor
 except:

diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index 0b4f42711353c0b0951737f1c62cef9e07d27b48..cc6774c2966b439fc2b4b221fe926e8038cdbbf1 100644 (file)
--- 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:
                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()
                                self.logOut() # Clean up everything
                self.timeout = reactor.callLater(30, timeout)
                dispatchFactory = msn.DispatchFactory()