[Pywikibot-commits] [Gerrit] site.loadrevisions():request contentmodel and sha1 from prop... - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: site.loadrevisions():request contentmodel and sha1 from proper MW version ...................................................................... site.loadrevisions():request contentmodel and sha1 from proper MW version Request contentmodel only from MW >=1.21 and sha1 from MW >= 1.19. Support for these params has been inserted in such versions. Change-Id: I4d5384f9ee10a909fa7684181dbac6ac71320982 --- M pywikibot/data/api.py M pywikibot/site.py 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 8ce923b..c932613 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3061,8 +3061,6 @@ page._protection[item['type']] = item['level'], item['expiry'] if 'revisions' in pagedict: # TODO: T102735: Use the page content model for <1.21 - # TODO: Add rvprop 'contentmodel' to all revisions calls, but only - # on 1.21+ otherwise it causes API warnings for rev in pagedict['revisions']: assert 'parentid' in rev, 'parentid missing in revision %r' % rev diff --git a/pywikibot/site.py b/pywikibot/site.py index 25dedf7..8199c1f 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3668,8 +3668,13 @@ rvargs = {'type_arg': 'info|revisions'} + rvargs['rvprop'] = ['ids', 'timestamp', 'flags', 'comment', 'user'] + if MediaWikiVersion(self.version()) >= MediaWikiVersion('1.21'): + rvargs['rvprop'].append('contentmodel') + if MediaWikiVersion(self.version()) >= MediaWikiVersion('1.19'): + rvargs['rvprop'].append('sha1') if getText: - rvargs[u"rvprop"] = u"ids|flags|timestamp|user|comment|content|sha1" + rvargs['rvprop'].append('content') if section is not None: rvargs[u"rvsection"] = unicode(section) if rollback: -- To view, visit https://gerrit.wikimedia.org/r/245187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d5384f9ee10a909fa7684181dbac6ac71320982 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>