diff --git a/otp/login/AstronLoginManager.py b/otp/login/AstronLoginManager.py index a715e56..626de28 100644 --- a/otp/login/AstronLoginManager.py +++ b/otp/login/AstronLoginManager.py @@ -7,11 +7,9 @@ class AstronLoginManager(DistributedObjectGlobal): def __init__(self, cr): DistributedObjectGlobal.__init__(self, cr) - self.doneEvent = None self._callback = None - def handleRequestLogin(self, doneEvent): - self.doneEvent = doneEvent + def handleRequestLogin(self): playToken = self.cr.playToken or 'dev' self.sendRequestLogin(playToken) diff --git a/otp/login/LoginScreen.py b/otp/login/LoginScreen.py index 98ad023..5688f70 100644 --- a/otp/login/LoginScreen.py +++ b/otp/login/LoginScreen.py @@ -255,7 +255,7 @@ class LoginScreen(StateData.StateData, GuiScreen.GuiScreen): def handleHelloResp(self): self.cr.startHeartbeat() - self.cr.astronLoginManager.handleRequestLogin(self.doneEvent) + self.cr.astronLoginManager.handleRequestLogin() def getExtendedErrorMsg(self, errorString): prefix = 'Bad DC Version Compare' @@ -591,8 +591,7 @@ class LoginScreen(StateData.StateData, GuiScreen.GuiScreen): canChat = createFriendsWithChat == "YES" or createFriendsWithChat == "CODE" self.cr.secretChatAllowed = canChat if base.logPrivateInfo: - self.notify.info( - "CREATE_FRIENDS_WITH_CHAT from game server login: %s %s" % (createFriendsWithChat, canChat)) + self.notify.info("CREATE_FRIENDS_WITH_CHAT from game server login: %s %s" % (createFriendsWithChat, canChat)) self.chatCodeCreationRule = responseData.get('chatCodeCreationRule') self.cr.chatChatCodeCreationRule = self.chatCodeCreationRule if base.logPrivateInfo: