jenkins-bot has submitted this change and it was merged.

Change subject: [IMPR] Replace fullVersionHistory() with revisions()
......................................................................


[IMPR] Replace fullVersionHistory() with revisions()

- create page instance on top of the method
- use revision properties

Change-Id: I56be946e4215a06c608839ba750f2b7e1423fad8
---
M scripts/revertbot.py
1 file changed, 11 insertions(+), 8 deletions(-)

Approvals:
  XZise: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/revertbot.py b/scripts/revertbot.py
index e283477..0da068e 100755
--- a/scripts/revertbot.py
+++ b/scripts/revertbot.py
@@ -91,31 +91,34 @@
         return 'top' in item
 
     def revert(self, item):
-        history = pywikibot.Page(self.site, item['title']).fullVersionHistory(
-            total=2, rollback=self.rollback)
+        page = pywikibot.Page(self.site, item['title'])
+        history = list(page.revisions(total=2))
         if len(history) > 1:
             rev = history[1]
         else:
             return False
         comment = i18n.twtranslate(
-            pywikibot.Site(), 'revertbot-revert',
-            {'revid': rev[0], 'author': rev[2], 'timestamp': rev[1]})
+            self.site, 'revertbot-revert',
+            {'revid': rev.revid,
+             'author': rev.user,
+             'timestamp': rev.timestamp})
         if self.comment:
             comment += ': ' + self.comment
-        page = pywikibot.Page(self.site, item['title'])
         pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<"
                          % page.title(asLink=True, forceInterwiki=True,
                                       textlink=True))
         if not self.rollback:
             old = page.text
-            page.text = rev[3]
+            page.text = rev.text
             pywikibot.showDiff(old, page.text)
             page.save(comment)
             return comment
         try:
             pywikibot.data.api.Request(
-                self.site, parameters={'action': 'rollback', 'title': page,
-                                       'user': self.user, 'token': rev[4],
+                self.site, parameters={'action': 'rollback',
+                                       'title': page,
+                                       'user': self.user,
+                                       'token': rev.rollbacktoken,
                                        'markbot': True}).submit()
         except pywikibot.data.api.APIError as e:
             if e.code == 'badtoken':

-- 
To view, visit https://gerrit.wikimedia.org/r/231875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I56be946e4215a06c608839ba750f2b7e1423fad8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits

Reply via email to