From 1bfe5c2ee71676002abee9cc73469f057fd82ccd Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Sat, 18 Jan 2014 23:58:18 -0500 Subject: [PATCH] Fix error handling in get_token(). --- earwigbot/wiki/site.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/earwigbot/wiki/site.py b/earwigbot/wiki/site.py index 390ff04..015ba7c 100644 --- a/earwigbot/wiki/site.py +++ b/earwigbot/wiki/site.py @@ -778,16 +778,16 @@ class Site(object): API issue. """ if lock: - result = self.api_query(action="tokens", type=action) + res = self.api_query(action="tokens", type=action) else: params = {"action": "tokens", "type": action} - result = self._api_query(params, ae_retry=False) + res = self._api_query(params, ae_retry=False) - if "warnings" in result and "token" in result["warnings"]: - raise exceptions.PermissionsError(result["warnings"]["token"]["*"]) + if "warnings" in res and "tokens" in res["warnings"]: + raise exceptions.PermissionsError(res["warnings"]["tokens"]["*"]) if "|" in action: - return result["tokens"] - return result["tokens"].values()[0] + return res["tokens"] + return res["tokens"].values()[0] def namespace_id_to_name(self, ns_id, all=False): """Given a namespace ID, returns associated namespace names.