[Pybridge-commits] SF.net SVN: pybridge: [417] trunk/pybridge/pybridge/network/client.py

[<umg...@us...>]

Revision: 417
          http://svn.sourceforge.net/pybridge/?rev=417&view=rev
Author:   umgangee
Date:     2007-06-13 08:18:35 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
Fix a bug in connectionLost(), which would call .clear() on rosters even if they were NoneType objects.

Modified Paths:
--------------
    trunk/pybridge/pybridge/network/client.py

Modified: trunk/pybridge/pybridge/network/client.py
===================================================================
--- trunk/pybridge/pybridge/network/client.py	2007-06-13 15:14:20 UTC (rev 416)
+++ trunk/pybridge/pybridge/network/client.py	2007-06-13 15:18:35 UTC (rev 417)
@@ -1,5 +1,5 @@
 # PyBridge -- online contract bridge made easy.
-# Copyright (C) 2004-2006 PyBridge Project.
+# Copyright (C) 2004-2007 PyBridge Project.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -10,7 +10,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -55,11 +55,12 @@
 
 
     def connectionLost(self, connector, reason):
-        # Reset invalidated remote references.
-        self.avatar = None
-        self.tables.clear()
-        self.tableRoster.clear()
-        self.userRoster.clear()
+        if self.avatar:
+            # Reset invalidated remote references.
+            self.avatar = None
+            self.tables.clear()
+            self.tableRoster.clear()
+            self.userRoster.clear()
 
         print "Lost connection: %s" % reason.getErrorMessage()
         self.notify('connectionLost', reason=reason.getErrorMessage())
@@ -133,8 +134,7 @@
         hash = sha.new(password).hexdigest()
         creds = credentials.UsernamePassword(username, hash)
         d = self.factory.login(creds, client=self)
-        d.addCallbacks(connectedAsUser, self.errback)
-        # for rostername...
+        d.addCallback(connectedAsUser)
 
         return d
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.