jenkins-bot merged this change.

View Change

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified
[bugfix] userinfo is required for user name or IP no

also fix api_tests.py for Fake error message

Bug: T244062
Change-Id: Ia0a7f4cfbcba08b1a0b86fa84f72577bd2cc8466
---
M pywikibot/data/api.py
M tests/api_tests.py
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index bd169d9..79cb0f7 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -2075,8 +2075,8 @@
if self.site.user():
result['error']['current user'] = self.site.user()
else: # not logged in; show the IP
- si = self.site.siteinfo
- result['error']['current user'] = si['name']
+ uinfo = self.site.userinfo
+ result['error']['current user'] = uinfo['name']

# raise error
try:
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 07e6360..ca3a076 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -98,7 +98,7 @@
'API error internal_api_error_fake: Fake error message')
pywikibot.error.assert_called_with(
'Detected MediaWiki API exception internal_api_error_fake: '
- 'Fake error message [servedby:unittest]; raising')
+ 'Fake error message\n[servedby:unittest]; raising')
finally:
self.warning_patcher.stop()
self.error_patcher.stop()

To view, visit change 571730. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a7f4cfbcba08b1a0b86fa84f72577bd2cc8466
Gerrit-Change-Number: 571730
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)