jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/584885 )
Change subject: [bugfix] Let clientlogin handle APIError class instead of response
......................................................................
[bugfix] Let clientlogin handle APIError class instead of response
- reverts I4c7eae246a08ca86d92b7fde29689dc70af20126
+ simplify Throttle response
Bug: T248945
Change-Id: Iec89f005cd17ed55d64fdb15846f3e49038266d9
---
M pywikibot/data/api.py
1 file changed, 11 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 917287a..499722b 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1898,7 +1898,8 @@
def _bad_token(self, code):
"""Check for bad token."""
- if code != 'badtoken':
+ if (code != 'badtoken' or self.site._loginstatus
+ == pywikibot.site.LoginStatus.IN_PROGRESS):
return False
user_tokens = self.site.tokens._tokens[self.site.user()]
@@ -1972,9 +1973,7 @@
self._handle_warnings(result)
- # LoginManager handles errors on its own
- if ('error' not in result or self.site._loginstatus
- == pywikibot.site.LoginStatus.IN_PROGRESS):
+ if 'error' not in result:
return result
error = result['error'].copy()
@@ -3084,6 +3083,7 @@
'token': ('lgtoken', 'logintoken'),
'result': ('result', 'status'),
'success': ('Success', 'PASS'),
+ 'fail': ('Failed', 'FAIL'),
'reason': ('reason', 'message')
}
@@ -3149,7 +3149,10 @@
login_request[self.keyword('token')] = self.get_login_token()
# try to login
- login_result = login_request.submit()
+ try:
+ login_result = login_request.submit()
+ except APIError as e:
+ login_result = {'error': e.__dict__}
# clientlogin response can be clientlogin or error
if self.action in login_result:
@@ -3178,9 +3181,9 @@
pywikibot.error('Received incorrect login token. '
'Forcing re-login.')
continue
- elif (status == 'Throttled' or status == 'FAIL'
- and response['messagecode'] == 'login-throttled'
- or status == 'Failed' and 'wait' in fail_reason):
+ 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(
--
To view, visit
https://gerrit.wikimedia.org/r/584885
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec89f005cd17ed55d64fdb15846f3e49038266d9
Gerrit-Change-Number: 584885
Gerrit-PatchSet: 4
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)