jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/643014 ) Change subject: [bugfix] delta must not be an int but a timedelta type ...................................................................... [bugfix] delta must not be an int but a timedelta type Bug: T268445 Change-Id: I42bd841700f330c494e60267902acfb177d798fb --- M pywikibot/data/api.py 1 file changed, 16 insertions(+), 13 deletions(-) Approvals: Rubin: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index cb6abe1..40dee1a 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3034,7 +3034,8 @@ fail_reason = response.get(self.keyword('reason'), '') if status == self.keyword('success'): return '' - elif status in ('NeedToken', 'WrongToken', 'badtoken'): + + if status in ('NeedToken', 'WrongToken', 'badtoken'): token = response.get('token') if token and below_mw_1_27: # fetched token using action=login @@ -3049,22 +3050,24 @@ # invalidate superior wiki cookies (T224712) _invalidate_superior_cookies(self.site.family) continue - elif (status == 'Throttled' or status == self.keyword('fail') - and (response['messagecode'] == 'login-throttled' - or 'wait' in fail_reason)): - match = re.search(r'(\d+) (seconds|minutes)', fail_reason) - if match: - delta = datetime.timedelta( - **{match.group(2): int(match.group(1))}) - else: - delta = 0 + + if (status == 'Throttled' or status == self.keyword('fail') + and (response['messagecode'] == 'login-throttled' + or 'wait' in fail_reason)): wait = response.get('wait') if wait: delta = datetime.timedelta(seconds=int(wait)) + else: + match = re.search(r'(\d+) (seconds|minutes)', fail_reason) + if match: + delta = datetime.timedelta( + **{match.group(2): int(match.group(1))}) + else: + delta = datetime.timedelta() self._waituntil = datetime.datetime.now() + delta - break - else: - break + + break + if 'error' in login_result: raise APIError(**response) info = fail_reason -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/643014 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I42bd841700f330c494e60267902acfb177d798fb Gerrit-Change-Number: 643014 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged