jenkins-bot has submitted this change and it was merged.
Change subject: Move setting of prop=proofread in Request._add_defaults()
......................................................................
Move setting of prop=proofread in Request._add_defaults()
Convert to a more general approach instead of being specific for
a particular site method.
Avoid use of req._params[key].append()
Removed comment 'TODO: Bug T91912' as bug as been resolved upstream.
Change-Id: I22650d603bc8427b5445a43daafe3717b81472fc
---
M pywikibot/data/api.py
M pywikibot/site.py
2 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index b66fa65..e5f1752 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1667,8 +1667,8 @@
if self.action == 'query':
meta = self._params.get("meta", [])
if "userinfo" not in meta:
- meta.append("userinfo")
- self._params["meta"] = meta
+ meta = set(meta + ['userinfo'])
+ self._params['meta'] = list(meta)
uiprop = self._params.get("uiprop", [])
uiprop = set(uiprop + ["blockinfo", "hasmsg"])
self._params["uiprop"] = list(sorted(uiprop))
@@ -1677,6 +1677,10 @@
inprop = self._params.get("inprop", [])
info = set(inprop + ["protection", "talkid",
"subjectid"])
self._params["info"] = list(info)
+ if 'prop' in self._params:
+ if self.site.has_extension('ProofreadPage'):
+ prop = set(self._params['prop'] + ['proofread'])
+ self._params['prop'] = list(prop)
# When neither 'continue' nor 'rawcontinue' is present and
the
# version number is at least 1.25wmf5 we add a dummy rawcontinue
# parameter. Querying siteinfo is save as it adds 'continue'.
@@ -2839,12 +2843,6 @@
parameters['generator'] = generator
QueryGenerator.__init__(self, **kwargs)
self.resultkey = "pages" # element to look for in result
-
- # TODO: Bug T91912 when using step > 50 with proofread, with queries
- # returning Pages from Page ns.
- if self.site.has_extension('ProofreadPage'):
- self.request['prop'].append('proofread')
-
self.props = self.request['prop']
def result(self, pagedata):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 9aaceed..a4d6026 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3657,10 +3657,7 @@
raise ValueError(
"loadrevisions: endid > startid with rvdir=False")
- if self.has_extension('ProofreadPage'):
- rvargs = {'type_arg': 'info|revisions|proofread'}
- else:
- rvargs = {'type_arg': 'info|revisions'}
+ rvargs = {'type_arg': 'info|revisions'}
if getText:
rvargs[u"rvprop"] =
u"ids|flags|timestamp|user|comment|content|sha1"
--
To view, visit
https://gerrit.wikimedia.org/r/216127
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22650d603bc8427b5445a43daafe3717b81472fc
Gerrit-PatchSet: 8
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>