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

List:       kde-commits
Subject:    [kajongg/sid] src: move code from Game.close to PlayingGame.close
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2013-10-31 21:21:12
Message-ID: E1Vbzg0-0002lj-St () scm ! kde ! org
[Download RAW message or body]

Git commit 3a14325be038a2de4a916848baf39e20cd58fa28 by Wolfgang Rohdewald.
Committed on 31/10/2013 at 12:01.
Pushed by wrohdewald into branch 'sid'.

move code from Game.close to PlayingGame.close

M  +9    -9    src/game.py

http://commits.kde.org/kajongg/3a14325be038a2de4a916848baf39e20cd58fa28

diff --git a/src/game.py b/src/game.py
index cc73adf..4890054 100644
--- a/src/game.py
+++ b/src/game.py
@@ -258,14 +258,6 @@ class Game(object):
         """log off from the server and return a Deferred"""
         self.wall = None
         self.lastDiscard = None
-        if self.client:
-            client = self.client
-            self.client = None
-            result = client.logout()
-            client.delete()
-        else:
-            result = succeed(None)
-        return result
 
     def playerByName(self, playerName):
         """return None or the matching player"""
@@ -663,8 +655,16 @@ class PlayingGame(Game):
 
     def close(self):
         """log off from the server and return a Deferred"""
+        Game.close(self)
         Internal.autoPlay = False # do that only for the first game
-        return Game.close(self)
+        if self.client:
+            client = self.client
+            self.client = None
+            result = client.logout()
+            client.delete()
+        else:
+            result = succeed(None)
+        return result
 
     def _setGameId(self):
         """do nothing, we already went through the game id reservation"""

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