jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/525197 ) Change subject: refactor(LoginManager.__init__): reduce duplicate lines of codes ...................................................................... refactor(LoginManager.__init__): reduce duplicate lines of codes Hopefully this reduces code complexity. The overall logic is unchanged. Change-Id: I89c2529db63d4811400a50d3e550b45dd1cd2494 --- M pywikibot/login.py M tests/login_tests.py 2 files changed, 19 insertions(+), 34 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index 0e64b5f..3bc7661 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -80,43 +80,28 @@ @raises NoUsername: No username is configured for the requested site. """ - self.site = site or pywikibot.Site() - if user: - self.username = user - elif sysop: - config_names = config.sysopnames - family_sysopnames = ( - config_names[self.site.family.name] or config_names['*'] - ) - self.username = family_sysopnames.get(self.site.code, None) - try: - self.username = self.username or family_sysopnames['*'] - except KeyError: - raise NoUsername(""" \ -ERROR: Sysop username for %(fam_name)s:%(wiki_code)s is undefined. -If you have a sysop account for that site, please add a line to user-config.py: + site = self.site = site or pywikibot.Site() + if not user: + if sysop: + config_names = config.sysopnames + else: + config_names = config.usernames -sysopnames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'""" - % {'fam_name': self.site.family.name, - 'wiki_code': self.site.code}) - else: - config_names = config.usernames - family_usernames = ( - config_names[self.site.family.name] or config_names['*'] - ) - self.username = family_usernames.get(self.site.code, None) + code_to_usr = config_names[site.family.name] or config_names['*'] try: - self.username = self.username or family_usernames['*'] + user = code_to_usr.get(site.code) or code_to_usr['*'] except KeyError: - raise NoUsername(""" \ -ERROR: Username for %(fam_name)s:%(wiki_code)s is undefined. -If you have an account for that site, please add a line to user-config.py: - -usernames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'""" - % {'fam_name': self.site.family.name, - 'wiki_code': self.site.code}) + raise NoUsername( + 'ERROR: ' + '{account} for {fam_name}:{wiki_code} is undefined.\n' + 'If you have a {account} for that site, ' + 'please add a line to user-config.py as follows:\n' + "{account}s['{fam_name}']['{wiki_code}'] = 'myUsername'" + .format( + fam_name=site.family.name, wiki_code=site.code, + account='sysopname' if sysop else 'username')) self.password = password - self.login_name = self.username + self.login_name = self.username = user if getattr(config, 'password_file', ''): self.readPassword() diff --git a/tests/login_tests.py b/tests/login_tests.py index 1eb85b4..888747c 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -74,7 +74,7 @@ del FakeConfig.usernames['*'] FakeConfig.usernames['*']['en'] = FakeUsername - error_undefined_username = 'ERROR: Username for.*is undefined.\nIf' + error_undefined_username = 'ERROR: username for.*is undefined.\nIf' self.assertRaisesRegex(NoUsername, error_undefined_username, LoginManager) FakeConfig.usernames['*']['*'] = FakeUsername -- To view, visit https://gerrit.wikimedia.org/r/525197 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I89c2529db63d4811400a50d3e550b45dd1cd2494 Gerrit-Change-Number: 525197 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)