From 482db43b2e6adf587a88174c5405f1b2d8db4dd1 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Thu, 19 Jul 2012 16:08:57 -0400 Subject: [PATCH] Improve assert=bot. --- earwigbot/wiki/page.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/earwigbot/wiki/page.py b/earwigbot/wiki/page.py index 71479b3..0852657 100644 --- a/earwigbot/wiki/page.py +++ b/earwigbot/wiki/page.py @@ -442,8 +442,19 @@ class Page(CopyvioMixIn): raise exceptions.LoginError(e) elif assertion == "bot": - e = "AssertEdit: bot assertion failed; we don't have a bot flag!" - raise exceptions.PermissionsError(e) + if not all(self.site._login_info): + # Insufficient login info: + e = "AssertEdit: bot assertion failed, and no login info was provided." + raise exceptions.PermissionsError(e) + if tries == 0: + # Try to log in if we got logged out: + self.site._login(self.site._login_info) + self._token = None # Need a new token; old one is invalid now + return self._edit(params=params, tries=1) + else: + # We already tried to log in, so we don't have a bot flag: + e = "AssertEdit: bot assertion failed: we don't have a bot flag!" + raise exceptions.PermissionsError(e) # Unknown assertion, maybe "true", "false", or "exists": e = "AssertEdit: assertion '{0}' failed.".format(assertion)