jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/572922 )
Change subject: [cleanup] Remove deprecated "rvtoken" ......................................................................
[cleanup] Remove deprecated "rvtoken"
- remove rollback option of Site.loadrevisions() - remove rollback option of Page.revisions() - remove useless site_tests.TestSiteLoadRevisionsSysop
Bug: T74763 Change-Id: Iaf24764a9cc57bd92916b31b3c7494d57d35664d --- M pywikibot/page/__init__.py M pywikibot/site/__init__.py M tests/site_tests.py 3 files changed, 6 insertions(+), 23 deletions(-)
Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 4704b67..5f566f0 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1747,14 +1747,15 @@ else: return lastmove.target_page
- @deprecated_args(getText='content', reverseOrder='reverse', step=None) + @deprecated_args(getText='content', reverseOrder='reverse', step=None, + rollback=None) def revisions(self, reverse=False, total=None, content=False, - rollback=False, starttime=None, endtime=None): + starttime=None, endtime=None): """Generator which loads the version history as Revision instances.""" # TODO: Only request uncached revisions self.site.loadrevisions(self, content=content, rvdir=reverse, starttime=starttime, endtime=endtime, - total=total, rollback=rollback) + total=total) return (self._revisions[rev] for rev in sorted(self._revisions, reverse=not reverse)[:total])
diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 59ae4ab..65a0685 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -4049,10 +4049,11 @@ total=total, g_content=content, **cmargs)
@deprecated_args(getText='content', sysop=None) + @remove_last_args(['rollback']) def loadrevisions(self, page, content=False, revids=None, startid=None, endid=None, starttime=None, endtime=None, rvdir=None, user=None, excludeuser=None, - section=None, step=None, total=None, rollback=False): + section=None, step=None, total=None): """Retrieve revision information and store it in page object.
By default, retrieves the last (current) revision of the page, @@ -4132,8 +4133,6 @@ rvargs['rvprop'].append('content') if section is not None: rvargs['rvsection'] = UnicodeType(section) - if rollback: - rvargs['rvtoken'] = 'rollback' if revids is None: rvtitle = page.title(with_section=False).encode(self.encoding()) rvargs['titles'] = rvtitle diff --git a/tests/site_tests.py b/tests/site_tests.py index e772cdc..8a8ee6d 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2751,23 +2751,6 @@ # TODO test other optional arguments
-class TestSiteLoadRevisionsSysop(DefaultSiteTestCase): - - """Test cases for Site.loadrevision() method.""" - - sysop = True - - def test_rollback(self): - """Test the site.loadrevisions() method with rollback.""" - mainpage = self.get_mainpage() - self.site.loadrevisions(mainpage, total=12, rollback=True) - self.assertIsNotEmpty(mainpage._revisions) - self.assertLessEqual(len(mainpage._revisions), 12) - if self.site.has_right('rollback'): - self.assertTrue(all(rev.rollbacktoken is not None - for rev in mainpage._revisions.values())) - - class TestBacklinks(TestCase):
"""Test for backlinks (issue T194233)."""