[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kajongg/sid] src: Do not suppress all exceptions while logging in
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2013-10-31 21:21:09
Message-ID: E1Vbzfx-0002lj-JG () scm ! kde ! org
[Download RAW message or body]

Git commit ad7a1249a2a4768817fcfdeab82cf7352c37b97d by Wolfgang Rohdewald.
Committed on 31/10/2013 at 08:45.
Pushed by wrohdewald into branch 'sid'.

Do not suppress all exceptions while logging in

M  +4    -2    src/humanclient.py

http://commits.kde.org/kajongg/ad7a1249a2a4768817fcfdeab82cf7352c37b97d

diff --git a/src/humanclient.py b/src/humanclient.py
index c537303..a2039c9 100644
--- a/src/humanclient.py
+++ b/src/humanclient.py
@@ -22,7 +22,7 @@ import csv, resource, random
 
 from twisted.spread import pb
 from twisted.python.failure import Failure
-from twisted.internet.defer import Deferred, succeed, DeferredList
+from twisted.internet.defer import Deferred, succeed, DeferredList, CancelledError
 from PyQt4.QtCore import Qt, QTimer
 from PyQt4.QtGui import QDialog, QVBoxLayout, QGridLayout, \
     QLabel, QPushButton, \
@@ -413,10 +413,12 @@ class HumanClient(Client):
             self.__showTables()
 
     @staticmethod
-    def __loginFailed(dummy):
+    def __loginFailed(result):
         """as the name says"""
         if Internal.field:
             Internal.field.startingGame = False
+        if result is not CancelledError:
+            logException(result)
 
     def isRobotClient(self):
         """avoid using isinstance, it would import too much for kajonggserver"""

[prev in list] [next in list] [prev in thread] [next in thread]