[Pywikibot-commits] [Gerrit] Move pagegenerators script function to listpages script - change (pywikibot/core)

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

Change subject: Move pagegenerators script function to listpages script ......................................................................

Move pagegenerators script function to listpages script

Change-Id: Iea4890f838fb4b81f110a2d4bbd7975d6156122c --- M pywikibot/pagegenerators.py A scripts/listpages.py 2 files changed, 43 insertions(+), 22 deletions(-)

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

diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index fb2754f..50fd0d7 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1260,26 +1260,5 @@ for day in xrange(1, date.getNumberOfDaysInMonth(month) + 1): yield pywikibot.Page(pywikibot.Link(fd(month, day), site))

- -def main(*args): - try: - gen = None - genFactory = GeneratorFactory() - for arg in pywikibot.handleArgs(*args): - genFactory.handleArg(arg) - gen = genFactory.getCombinedGenerator() - if gen: - i = 0 - for page in gen: - i += 1 - pywikibot.stdout("%4d: %s" % (i, page.title())) - else: - pywikibot.showHelp() - except Exception: - pywikibot.error("Fatal error", exc_info=True) - finally: - pywikibot.stopme() - - if __name__ == "__main__": - main() + pywikibot.output('Pagegenerators cannot be run as script - are you looking for listpages.py?') diff --git a/scripts/listpages.py b/scripts/listpages.py new file mode 100644 index 0000000..2cb668b --- /dev/null +++ b/scripts/listpages.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +""" +Print a list of pages, as defined by page generator parameterd + +These parameters are supported to specify which pages titles to print: + +&params; +""" +# +# (C) Pywikipedia bot team, 2008-2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + +import pywikibot +from pywikibot.pagegenerators import GeneratorFactory, parameterHelp + +docuReplacements = {'&params;': parameterHelp} + + +def main(*args): + try: + gen = None + genFactory = GeneratorFactory() + for arg in pywikibot.handleArgs(*args): + genFactory.handleArg(arg) + gen = genFactory.getCombinedGenerator() + if gen: + i = 0 + for page in gen: + i += 1 + pywikibot.stdout("%4d: %s" % (i, page.title())) + else: + pywikibot.showHelp() + except Exception: + pywikibot.error("Fatal error", exc_info=True) + finally: + pywikibot.stopme() + +if __name__ == "__main__": + main()