jenkins-bot has submitted this change and it was merged.
Change subject: fixup for 029ec04
......................................................................
fixup for 029ec04
- use self.login instead of self.site.login in Site
- use site._relogin rather than site.relogin
Change-Id: I564bef9106afe75b2111190dd5f4876061e73351
---
M pywikibot/data/api.py
M pywikibot/site.py
2 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 6283343..aafb63e 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1996,6 +1996,13 @@
# case, force a re-login.
username = result['query']['userinfo']['name']
if self.site.user() is not None and self.site.user() != username:
+ pywikibot.error(
+ "Logged in as '{actual}' instead of
'{expected}'. "
+ "Forcing re-login.".format(
+ actual=username,
+ expected=self.site.user()
+ )
+ )
self.site._relogin()
continue
@@ -2019,14 +2026,14 @@
code = result['error'].setdefault('code', 'Unknown')
info = result['error'].setdefault('info', None)
+ # Older wikis returned an error instead of a warning when
+ # the request asked for too many values. If we get this
+ # error, assume we are not logged in (we can't check this
+ # because the userinfo data is not present) and force
+ # a re-login
if code.endswith('limit'):
- # Older wikis returned an error instead of a warning when
- # the request asked for too many values. If we get this
- # error, assume we are not logged in (we can't check this
- # because the userinfo data is not present) and force
- # a re-login
pywikibot.error("Received API limit error. Forcing re-login")
- self.site.relogin()
+ self.site._relogin()
continue
if code == "maxlag":
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 1ebbfc9..fa9e518 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1934,7 +1934,7 @@
del self._userinfo
old_status = self._loginstatus
self._loginstatus = LoginStatus.NOT_LOGGED_IN
- self.site.login(old_status)
+ self.login(old_status)
def logout(self):
"""Logout of the site and load details for the logged out user.
--
To view, visit
https://gerrit.wikimedia.org/r/236413
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I564bef9106afe75b2111190dd5f4876061e73351
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>