jenkins-bot has submitted this change and it was merged.
Change subject: Use site.moved_target() instead of local implementation ......................................................................
Use site.moved_target() instead of local implementation
Change-Id: I4418bd96d2031f89114e1119009ea9c066065f9c --- M scripts/redirect.py 1 file changed, 5 insertions(+), 10 deletions(-)
Approvals: XZise: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/redirect.py b/scripts/redirect.py index 9792ce1..67c4e84 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -418,15 +418,6 @@ for redir_name in self.generator.retrieve_broken_redirects(): self.delete_1_broken_redirect(redir_name)
- def moved_page(self, source): - gen = iter(self.site.logevents(logtype='move', page=source, total=1)) - try: - lastmove = next(gen) - except StopIteration: - return None - else: - return lastmove.new_title() - def delete_1_broken_redirect(self, redir_name): if isinstance(redir_name, basestring): redir_page = pywikibot.Page(self.site, redir_name) @@ -454,7 +445,11 @@ pywikibot.exception() pass except pywikibot.NoPage: - movedTarget = self.moved_page(targetPage) + movedTarget = None + try: + movedTarget = targetPage.moved_target() + except pywikibot.NoMoveTarget: + pass if movedTarget: if not movedTarget.exists(): # FIXME: Test to another move