jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Clean up moved_target merge ......................................................................
[FIX] Clean up moved_target merge
Some comments haven't been applied before the merge of d322e616.
Change-Id: Idb07451fc8ddb946f02de21769b8f4348bc354cc --- M pywikibot/page.py M tests/logentry_tests.py 2 files changed, 17 insertions(+), 8 deletions(-)
Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified
Objections: XZise: There's a problem with this change, please improve
diff --git a/pywikibot/page.py b/pywikibot/page.py index 2b9801b..5cbf80c 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1464,7 +1464,7 @@ def moved_target(self): """Return a Page object for the target this Page was moved to.
- If this page was not moved, it will raise a PageNotFound exception. + If this page was not moved, it will raise a NoMoveTarget exception. This method also works if the source was already deleted.
@rtype: pywikibot.Page diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index 55fbcb5..7cb7f9a 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -191,13 +191,14 @@ """Test moved_target method.""" # main page was moved around mainpage = self.get_mainpage(self.site) - if self.sites[key]['target'] is not None: - target = mainpage.moved_target() - self.assertIsInstance(target, pywikibot.Page) - self.assertEqual(target.title(), - self.sites[key]['target']) - # main page was moved back again, we test it. - self.assertEqual(mainpage, target.moved_target()) + if self.sites[key]['target'] is None: + raise unittest.SkipTest('No moved target') + target = mainpage.moved_target() + self.assertIsInstance(target, pywikibot.Page) + self.assertEqual(target.title(), + self.sites[key]['target']) + # main page was moved back again, we test it. + self.assertEqual(mainpage, target.moved_target())
def test_moved_target_fail_old(self): """Test moved_target method failing on older wiki.""" @@ -264,12 +265,20 @@ with self.assertRaises(pywikibot.NoPage): self.get_mainpage(site).getMovedTarget()
+ self._do_test_warning_filename = False + self.assertDeprecation('pywikibot.page.BasePage.getMovedTarget is ' + 'deprecated, use moved_target() instead.') + def test_moved_target_fail_de(self): """Test getMovedTarget method failing on de-wiki.""" page = pywikibot.Page(self.get_site('dewp'), 'Main Page') with self.assertRaises(pywikibot.NoPage): page.getMovedTarget()
+ self._do_test_warning_filename = False + self.assertDeprecation('pywikibot.page.BasePage.getMovedTarget is ' + 'deprecated, use moved_target() instead.') +
if __name__ == '__main__': try: