Revision: 6383 Author: nicdumz Date: 2009-02-20 05:27:52 +0000 (Fri, 20 Feb 2009)

Log Message: ----------- GeneratorFactory changed in trunk, and changes were merged here; but the __main__ needs a few fixes

Modified Paths: -------------- branches/rewrite/pywikibot/pagegenerators.py

Modified: branches/rewrite/pywikibot/pagegenerators.py =================================================================== --- branches/rewrite/pywikibot/pagegenerators.py 2009-02-20 04:13:44 UTC (rev 6382) +++ branches/rewrite/pywikibot/pagegenerators.py 2009-02-20 05:27:52 UTC (rev 6383) @@ -939,9 +939,8 @@ gen = None genFactory = GeneratorFactory() for arg in pywikibot.handleArgs(): - generator = genFactory.handleArg(arg) - if generator: - gen = generator + genFactory.handleArg(arg) + gen = genFactory.getCombinedGenerator() if gen: for page in gen: pywikibot.output(page.title(), toStdout = True)