Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/279936
Change subject: [IMPR] Simplify filterredir assignment
......................................................................
[IMPR] Simplify filterredir assignment
- use implementation of Site.prefixindex
- add and reorder documentation
Change-Id: If79dbef6a0877344ec22aa980c932eee9df9d27d
---
M pywikibot/pagegenerators.py
1 file changed, 19 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/36/279936/1
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 224f93a..5acde80 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -976,11 +976,23 @@
"""
Prefixed Page generator.
+ @param prefix: The prefix of the pages.
+ @type prefix: str
+ @param namespace: Namespace to retrieve pages from
+ @type namespace: int
+ @param includeredirects: If includeredirects is None, False or an empty
+ string, redirects will not be found. If includeredirects equals the
+ string 'only', only redirects will be found. Otherwise redirects will
+ be included.
+ @type includeredirects: None, bool, str
+ @param site: Site for generator results.
+ @type site: L{pywikibot.site.BaseSite}
@param total: Maximum number of pages to retrieve in total
@type total: int
@param content: If True, load current version of each page (default False)
- @param site: Site for generator results.
- @type site: L{pywikibot.site.BaseSite}
+ @type content: bool
+ @return: a generator that yields Page objects
+ @rtype: generator
"""
if site is None:
site = pywikibot.Site()
@@ -988,13 +1000,12 @@
if namespace is None:
namespace = prefixlink.namespace
title = prefixlink.title
- if includeredirects:
- if includeredirects == 'only':
- filterredir = True
- else:
- filterredir = None
- else:
+ if not includeredirects:
filterredir = False
+ elif includeredirects == 'only':
+ filterredir = True
+ else:
+ filterredir = None
return site.allpages(prefix=title, namespace=namespace,
filterredir=filterredir, total=total, content=content)
--
To view, visit https://gerrit.wikimedia.org/r/279936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If79dbef6a0877344ec22aa980c932eee9df9d27d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
