jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/432761 )
Change subject: [cleanup] deprecate pagegenerators.CombinedPageGenerator
......................................................................
[cleanup] deprecate pagegenerators.CombinedPageGenerator
This could be easily replaced by standard itertools.chain(*iterables)
Change-Id: I4340dd38fb1fb52afef3c428329185543d1c4d32
---
M pywikibot/pagegenerators.py
M scripts/interwiki.py
M scripts/misspelling.py
M scripts/nowcommons.py
M scripts/template.py
5 files changed, 18 insertions(+), 13 deletions(-)
Approvals:
Zhuyifei1999: Looks good to me, but someone else must approve
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 8208fad..8c1d325 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -527,7 +527,7 @@
# By definition no duplicates are possible.
dupfiltergen = gensList
else:
- gensList = CombinedPageGenerator(self.gens)
+ gensList = itertools.chain(*self.gens)
dupfiltergen = self._filter_unique(gensList)
# Add on subpage filter generator
@@ -1960,6 +1960,7 @@
pywikibot.output(u'Skipping %s' % page.title(asLink=True))
+@deprecated('itertools.chain(*iterables)')
def CombinedPageGenerator(generators):
"""Yield from each iterable until exhausted, then proceed with the next."""
return itertools.chain(*generators)
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 82d4f94..87b83a0 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -349,6 +349,7 @@
from __future__ import absolute_import, unicode_literals
import codecs
+from itertools import chain
import os
import pickle
import re
@@ -2520,8 +2521,7 @@
namespace = 0
gen2 = pagegenerators.AllpagesPageGenerator(
nextPage, namespace, includeredirects=False)
- hintlessPageGen = pagegenerators.CombinedPageGenerator(
- [hintlessPageGen, gen2])
+ hintlessPageGen = chain(hintlessPageGen, gen2)
restoredFiles.append(dumpFileName)
bot = InterwikiBot(iwconf)
diff --git a/scripts/misspelling.py b/scripts/misspelling.py
index b73eed6..d86635a 100755
--- a/scripts/misspelling.py
+++ b/scripts/misspelling.py
@@ -22,11 +22,13 @@
wikipedia, user, etc. namespaces.
"""
# (C) Daniel Herding, 2007
-# (C) Pywikibot team, 2007-2017
+# (C) Pywikibot team, 2007-2018
#
# Distributed under the terms of the MIT license.
#
from __future__ import absolute_import, unicode_literals
+
+from itertools import chain
import pywikibot
@@ -109,7 +111,7 @@
empty_gen = (i for i in [])
return empty_gen
- generator = pagegenerators.CombinedPageGenerator(generators)
+ generator = chain(*generators)
preloadingGen = pagegenerators.PreloadingGenerator(generator)
return preloadingGen
diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py
index 9dcbd38..7c015d7 100755
--- a/scripts/nowcommons.py
+++ b/scripts/nowcommons.py
@@ -55,6 +55,7 @@
#
from __future__ import absolute_import, unicode_literals
+from itertools import chain
import sys
import pywikibot
@@ -216,10 +217,10 @@
@property
def generator(self):
"""Generator method."""
- gens = [t.getReferences(follow_redirects=True, namespaces=[6],
+ gens = (t.getReferences(follow_redirects=True, namespaces=[6],
onlyTemplateInclusion=True)
- for t in self.nc_templates]
- gen = pg.CombinedPageGenerator(gens)
+ for t in self.nc_templates)
+ gen = chain(*gens)
gen = pg.DuplicateFilterPageGenerator(gen)
gen = pg.PreloadingGenerator(gen)
return gen
diff --git a/scripts/template.py b/scripts/template.py
index b04dd38..f3731cd 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -106,13 +106,14 @@
#
# (C) Daniel Herding, 2004
# (C) Rob W.W. Hooft, 2003-2005
-# (C) xqt, 2009-2017
-# (C) Pywikibot team, 2004-2017
+# (C) xqt, 2009-2018
+# (C) Pywikibot team, 2004-2018
#
# Distributed under the terms of the MIT license.
#
from __future__ import absolute_import, unicode_literals
+from itertools import chain
import re
from warnings import warn
@@ -351,12 +352,12 @@
gen = genFactory.getCombinedGenerator()
if not gen:
- gens = [
+ gens = (
pagegenerators.ReferringPageGenerator(t,
onlyTemplateInclusion=True)
for t in oldTemplates
- ]
- gen = pagegenerators.CombinedPageGenerator(gens)
+ )
+ gen = chain(*gens)
gen = pagegenerators.DuplicateFilterPageGenerator(gen)
if user:
gen = pagegenerators.UserEditFilterGenerator(gen, user, timestamp,
--
To view, visit https://gerrit.wikimedia.org/r/432761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4340dd38fb1fb52afef3c428329185543d1c4d32
Gerrit-Change-Number: 432761
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: Dalba <dalba.w...@gmail.com>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1...@gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
