jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/512116 )
Change subject: [cleanup] use "any" function instead of sequence of
"or" statements
......................................................................
[cleanup] use "any" function instead of sequence of "or" statements
Reduce code complexity from E32 to D26 in getCombinedGenerator
(reported from
codeclimate.com)
Change-Id: I386e9ab3c2126d80d457053247368cf5226b6b23
---
M pywikibot/pagegenerators.py
1 file changed, 15 insertions(+), 16 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index ea2ae8e..2cd467c 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -526,17 +526,18 @@
self.gens[i].set_maximum_items(self.limit)
except AttributeError:
self.gens[i] = itertools.islice(self.gens[i], self.limit)
- if len(self.gens) == 0:
- if (self.titlefilter_list
- or self.titlenotfilter_list
- or self.articlefilter_list
- or self.claimfilter_list
- or self.catfilter_list
- or self.subpage_max_depth is not None
- or self.qualityfilter_list):
- pywikibot.warning(
- 'filter(s) specified but no generators.')
+
+ if not self.gens:
+ if any((self.titlefilter_list,
+ self.titlenotfilter_list,
+ self.articlefilter_list,
+ self.claimfilter_list,
+ self.catfilter_list,
+ self.qualityfilter_list,
+ self.subpage_max_depth is not None)):
+ pywikibot.warning('filter(s) specified but no generators.')
return None
+
elif len(self.gens) == 1:
dupfiltergen = self.gens[0]
if hasattr(self, '_single_gen_filter_unique'):
@@ -544,13 +545,11 @@
if self.intersect:
pywikibot.warning(
'"-intersect" ignored as only one generator is
specified.')
+ elif self.intersect:
+ # By definition no duplicates are possible.
+ dupfiltergen = intersect_generators(self.gens)
else:
- if self.intersect:
- # By definition no duplicates are possible.
- dupfiltergen = intersect_generators(self.gens)
- else:
- dupfiltergen = _filter_unique_pages(itertools.chain(
- *self.gens))
+ dupfiltergen = _filter_unique_pages(itertools.chain(*self.gens))
# Add on subpage filter generator
if self.subpage_max_depth is not None:
--
To view, visit
https://gerrit.wikimedia.org/r/512116
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I386e9ab3c2126d80d457053247368cf5226b6b23
Gerrit-Change-Number: 512116
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)