[Pywikibot-commits] [Gerrit] pywikibot/core[master]: Cleanup in interwikidata.py

jenkins-bot has submitted this change and it was merged. Change subject: Cleanup in interwikidata.py ...................................................................... Cleanup in interwikidata.py - Simplified processing command line arguments - Made generator and site go through kwargs Change-Id: I8806073c0d885b550fa9d6596973eb81c6f35cc3 --- M scripts/interwikidata.py 1 file changed, 8 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 50ee841..d19fbeb 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -52,7 +52,7 @@ """The bot for interwiki.""" - def __init__(self, generator, site, **kwargs): + def __init__(self, **kwargs): """Construct the bot.""" self.availableOptions.update({ 'clean': False, @@ -60,15 +60,15 @@ 'summary': None, 'ignore_ns': False, # used by interwikidata_tests only }) - super(IWBot, self).__init__(generator=generator, site=site, **kwargs) + super(IWBot, self).__init__(**kwargs) if not self.site.has_data_repository: raise ValueError('{site} does not have a data repository, ' 'use interwiki.py instead.'.format( site=self.site)) - self.repo = site.data_repository() + self.repo = self.site.data_repository() if not self.getOption('summary'): self.options['summary'] = pywikibot.i18n.twtranslate( - site, 'interwikidata-clean-summary') + self.site, 'interwikidata-clean-summary') def treat_page(self): """Check page.""" @@ -182,15 +182,14 @@ @param args: command line arguments @type args: list of unicode """ - generator = None local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() options = {} for arg in local_args: - option, sep, value = arg.partition(':') - option = option[1:] if option.startswith('-') else None if genFactory.handleArg(arg): continue + option, sep, value = arg.partition(':') + option = option[1:] if option.startswith('-') else None if option == 'summary': options[option] = value else: @@ -198,11 +197,10 @@ site = pywikibot.Site() - if not generator: - generator = genFactory.getCombinedGenerator() + generator = genFactory.getCombinedGenerator() if generator: generator = pagegenerators.PreloadingGenerator(generator) - bot = IWBot(generator, site, **options) + bot = IWBot(generator=generator, site=site, **options) bot.run() else: suggest_help(missing_generator=True) -- To view, visit https://gerrit.wikimedia.org/r/318667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8806073c0d885b550fa9d6596973eb81c6f35cc3 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek &lt;matejsuchanek97(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;Ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Matěj Suchánek &lt;matejsuchanek97(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>