jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356086 )
Change subject: FilePage: remove deprecated use of fileUrl
......................................................................
FilePage: remove deprecated use of fileUrl
Use get_file_url in favor of deprecated fileUrl.
Change-Id: I06ab79183b13918b89abfb3b7e7f3a27becfe1cb
---
M pywikibot/page.py
M tests/file_tests.py
2 files changed, 21 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 49f282e..3dbd1d8 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2495,10 +2495,10 @@
if not self.site.has_image_repository:
return False
elif 'wikitravel_shared' in self.site.shared_image_repository():
- return self.fileUrl().startswith(
+ return self.latest_file_info.url.startswith(
u'http://wikitravel.org/upload/shared/')
else:
- return self.fileUrl().startswith(
+ return self.latest_file_info.url.startswith(
'https://upload.wikimedia.org/wikipedia/commons/')
@deprecated("FilePage.latest_file_info.sha1")
diff --git a/tests/file_tests.py b/tests/file_tests.py
index 483b484..324f2c1 100644
--- a/tests/file_tests.py
+++ b/tests/file_tests.py
@@ -20,7 +20,7 @@
class TestShareFiles(TestCase):
- """Test methods fileIsShared, exists and fileUrl with shared
files."""
+ """Test fileIsShared, exists and fileUrl/get_file_url with shared
files."""
sites = {
'enwiki': {
@@ -43,6 +43,16 @@
cached = True
+ def test_fileUrl_versus_get_file_url(self):
+ """Test fileUrl() is equivalent to
get_file_url()."""
+ title = 'File:Sepp Maier 1.JPG'
+ commons = self.get_site('commons')
+ commons_file = pywikibot.FilePage(commons, title)
+ self.assertEqual(commons_file.fileUrl(), commons_file.get_file_url())
+ itwp = self.get_site('itwiki')
+ itwp_file = pywikibot.FilePage(itwp, title)
+ self.assertEqual(itwp_file.fileUrl(), itwp_file.get_file_url())
+
def testSharedOnly(self):
"""Test fileIsShared() on file page with shared file
only."""
title = 'File:Sepp Maier 1.JPG'
@@ -60,9 +70,9 @@
self.assertTrue(itwp_file.fileIsShared())
self.assertTrue(commons_file.fileIsShared())
- self.assertTrue(commons_file.fileUrl())
+ self.assertTrue(commons_file.get_file_url())
- self.assertIn('/wikipedia/commons/', itwp_file.fileUrl())
+ self.assertIn('/wikipedia/commons/', itwp_file.get_file_url())
self.assertRaises(pywikibot.NoPage, itwp_file.get)
def testLocalOnly(self):
@@ -78,14 +88,14 @@
commons_file = pywikibot.FilePage(commons, title)
- self.assertTrue(enwp_file.fileUrl())
+ self.assertTrue(enwp_file.latest_file_info.url)
self.assertTrue(enwp_file.exists())
self.assertFalse(commons_file.exists())
self.assertFalse(enwp_file.fileIsShared())
self.assertRaises(pywikibot.NoPage, commons_file.fileIsShared)
- self.assertRaises(pywikibot.NoPage, commons_file.fileUrl)
+ self.assertRaises(pywikibot.NoPage, commons_file.get_file_url)
self.assertRaises(pywikibot.NoPage, commons_file.get)
def testOnBoth(self):
@@ -100,7 +110,7 @@
commons_file = pywikibot.FilePage(commons, title)
- self.assertTrue(itwp_file.fileUrl())
+ self.assertTrue(itwp_file.get_file_url())
self.assertTrue(itwp_file.exists())
self.assertTrue(commons_file.exists())
@@ -115,13 +125,13 @@
testwp = self.get_site('testwiki')
testwp_file = pywikibot.FilePage(testwp, title)
- self.assertTrue(testwp_file.fileUrl())
+ self.assertTrue(testwp_file.latest_file_info.url)
self.assertTrue(testwp_file.exists())
self.assertTrue(testwp_file.fileIsShared())
commons_file = pywikibot.FilePage(commons, title)
- self.assertEqual(testwp_file.fileUrl(),
- commons_file.fileUrl())
+ self.assertEqual(testwp_file.get_file_url(),
+ commons_file.get_file_url())
class TestFilePage(TestCase):
--
To view, visit
https://gerrit.wikimedia.org/r/356086
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06ab79183b13918b89abfb3b7e7f3a27becfe1cb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>