[Pywikibot-commits] [Gerrit] Dont use 'gen' to refer to the generator factory - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged.

Change subject: Dont use 'gen' to refer to the generator factory ......................................................................

Dont use 'gen' to refer to the generator factory

Also use pagegenerators instead of alias pg

Change-Id: I31aa4d113ce6ca021c559c0b489d1a6b1904c86e --- M scripts/coordinate_import.py M scripts/illustrate_wikidata.py 2 files changed, 10 insertions(+), 9 deletions(-)

Approvals: Ricordisamoa: Looks good to me, approved jenkins-bot: Verified

diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 844d69e..f4f680e 100644 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -112,13 +112,13 @@ """ # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) - gen = pagegenerators.GeneratorFactory() + generator_factory = pagegenerators.GeneratorFactory()

for arg in local_args: - if gen.handleArg(arg): + if generator_factory.handleArg(arg): continue

- generator = gen.getCombinedGenerator() + generator = generator_factory.getCombinedGenerator()

if generator: coordbot = CoordImportRobot(generator) diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index e6c327b..c6c5518 100644 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -22,7 +22,8 @@ #

import pywikibot -from pywikibot import pagegenerators as pg, WikidataBot + +from pywikibot import pagegenerators, WikidataBot

docuReplacements = {'&params;': pywikibot.pagegenerators.parameterHelp}

@@ -41,7 +42,7 @@

""" super(IllustrateRobot, self).__init__() - self.generator = pg.PreloadingGenerator(generator) + self.generator = pagegenerators.PreloadingGenerator(generator) self.wdproperty = wdproperty self.cacheSources()

@@ -97,7 +98,7 @@ """ # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) - gen = pg.GeneratorFactory() + generator_factory = pagegenerators.GeneratorFactory()

wdproperty = u'P18'

@@ -108,10 +109,10 @@ u'Please enter the property you want to add:') else: wdproperty = arg[10:] - elif gen.handleArg(arg): - continue + else: + generator_factory.handleArg(arg)

- generator = gen.getCombinedGenerator() + generator = generator_factory.getCombinedGenerator() if not generator: pywikibot.output('I need a generator with pages to work on') return