From 18b1a576d7939d5739bcc2e8cca4248a76cc168a Mon Sep 17 00:00:00 2001 From: Adarnof Date: Mon, 9 May 2016 17:50:54 -0400 Subject: [PATCH] remove check for dictionary structure allows exceptions to occur for logging --- services/managers/teamspeak3_manager.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index f6f105cd..a6a5a2fe 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -182,14 +182,12 @@ class Teamspeak3Manager: 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) try: - if 'keys' in ret: - if 'token' in ret['keys']: - token = ret['keys']['token'] - logger.info("Created permission token for user %s on TS3 server" % username_clean) - return username_clean, token + token = ret['keys']['token'] + logger.info("Created permission token for user %s on TS3 server" % username_clean) + return username_clean, token except: - logger.exception("Failed to add teamspeak user %s - received response: %s" % (username, ret)) - return "","" + logger.exception("Failed to add teamspeak user %s - received response: %s" % (username_clean, ret)) + return "","" @staticmethod def add_blue_user(username, corp_ticker): @@ -209,14 +207,12 @@ class Teamspeak3Manager: 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) try: - if 'keys' in ret: - if 'token' in ret['keys']: - token = ret['keys']['token'] - logger.info("Created permission token for blue user %s on TS3 server" % username_clean) - return username_clean, token + token = ret['keys']['token'] + logger.info("Created permission token for blue user %s on TS3 server" % username_clean) + return username_clean, token except: - logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username, ret)) - return "","" + logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username_clean, ret)) + return "",""