Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/892495?usp=email )
Change subject: [bugfix] Get a token for private wiki
......................................................................
[bugfix] Get a token for private wiki
Bug: T328814
Change-Id: I9085b292e0f730e152e20686d8800805227eec65
---
M pywikibot/login.py
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/pywikibot/login.py b/pywikibot/login.py
index 42e41ab..1dcb503 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -454,14 +454,16 @@
if status in ('NeedToken', 'WrongToken', 'badtoken'):
# if incorrect login token was used,
# force relogin and generate fresh one
- pywikibot.error('Received incorrect login token. '
- 'Forcing re-login.')
+ pywikibot.error(f'{status}: Received incorrect login token.'
+ ' Forcing re-login.')
# invalidate superior wiki cookies (T224712)
pywikibot.data.api._invalidate_superior_cookies(
self.site.family)
- self.site.tokens.clear()
- login_request[
- self.keyword('token')] = self.site.tokens['login']
+ token = response.get('token')
+ if not token:
+ self.site.tokens.clear()
+ token = self.site.tokens['login']
+ login_request[self.keyword('token')] = token
continue
if status == 'UI': # pragma: no cover
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/892495?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I9085b292e0f730e152e20686d8800805227eec65
Gerrit-Change-Number: 892495
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: JJMC89 <[email protected]>
Gerrit-Reviewer: MarcoAurelio <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Chiefgeek157 <[email protected]>
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
