[Pywikibot-commits] [Gerrit] pywikibot/core[master]: Prettiest error when username is not precice in user-config

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/388254 ) Change subject: Prettiest error when username is not precice in user-config ...................................................................... Prettiest error when username is not precice in user-config Bug: T159972 Change-Id: I6cf5b1b6b81b83773e9b4b99a8a37b38bebb733f --- M pywikibot/site.py 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index 7b09c7f..ac96812 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2079,11 +2079,21 @@ if sysop: raise NoUsername('No sysop is permitted with OAuth') elif self.userinfo['name'] != self._username[sysop]: - raise NoUsername('Logged in on %(site)s via OAuth as ' - '%(wrong)s, but expect as %(right)s' - % {'site': self, - 'wrong': self.userinfo['name'], - 'right': self._username[sysop]}) + if self._username == [None, None]: + raise NoUsername('No username has been defined in your ' + 'user-config.py: you have to add in this ' + 'file the following line:\n' + "usernames['{family}']['{lang}'] " + "= '{username}'" + .format(family=self.family, + lang=self.lang, + username=self.userinfo['name'])) + else: + raise NoUsername('Logged in on {site} via OAuth as ' + '{wrong}, but expect as {right}' + .format(site=self, + wrong=self.userinfo['name'], + right=self._username[sysop])) else: raise NoUsername('Logging in on %s via OAuth failed' % self) loginMan = api.LoginManager(site=self, sysop=sysop, -- To view, visit https://gerrit.wikimedia.org/r/388254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cf5b1b6b81b83773e9b4b99a8a37b38bebb733f Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Framawiki &lt;framawiki(a)tools.wmflabs.org&gt; Gerrit-Reviewer: Framawiki &lt;framawiki(a)tools.wmflabs.org&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Zoranzoki21 &lt;zorandori4444(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot <>