[Pywikibot-commits] [Gerrit] Wild card '*' in user-config does not allow login - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Wild card '*' in user-config does not allow login ...................................................................... Wild card '*' in user-config does not allow login Allow login with: usernames['family']['*'] or sysopnames['family']['*'] in user-config.py. Bug: 69342 Change-Id: Ic0dc3a614df40ffdb400e15122cadaa82ed86266 --- M pywikibot/login.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index 46afba3..0026aba 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -44,8 +44,9 @@ self.username = user elif sysop: try: - self.username = config.sysopnames[ - self.site.family.name][self.site.code] + family_sysopnames = config.sysopnames[self.site.family.name] + self.username = family_sysopnames.get(self.site.code, None) + self.username = self.username or family_sysopnames['*'] except KeyError: raise NoUsername(u"""\ ERROR: Sysop username for %(fam_name)s:%(wiki_code)s is undefined. @@ -56,8 +57,9 @@ 'wiki_code': self.site.code}) else: try: - self.username = config.usernames[ - self.site.family.name][self.site.code] + family_usernames = config.usernames[self.site.family.name] + self.username = family_usernames.get(self.site.code, None) + self.username = self.username or family_usernames['*'] except: raise NoUsername(u"""\ ERROR: Username for %(fam_name)s:%(wiki_code)s is undefined. @@ -196,7 +198,7 @@ # % {'name': self.username, # 'page': botList[self.site.family.name][self.site.code]}) # logger.error( -#"Please make sure you are allowed to use the robot before actually using it!") +# "Please make sure you are allowed to use the robot before actually using it!") # return False return True -- To view, visit https://gerrit.wikimedia.org/r/156987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0dc3a614df40ffdb400e15122cadaa82ed86266 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: jenkins-bot <>