jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371710 )
Change subject: [IMPR] family.from_url url may contain a title
......................................................................
[IMPR] family.from_url url may contain a title
Bug: T173253
Change-Id: I72d1ee362f340024bd8d0b73367ae706880f3b1c
---
M pywikibot/family.py
M tests/family_tests.py
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 79f4f33..a25ebba 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1242,8 +1242,10 @@
site = pywikibot.Site(code, self.name)
pywikibot.log('Found candidate {0}'.format(site))
- if path in site._interwiki_urls():
- matched_sites += [site]
+ for iw_url in site._interwiki_urls():
+ if iw_url in path:
+ matched_sites += [site]
+ break
if len(matched_sites) == 1:
return matched_sites[0].code
diff --git a/tests/family_tests.py b/tests/family_tests.py
index 5359776..19a841d 100644
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -207,6 +207,9 @@
self.assertEqual(f.from_url('//vo.wikipedia.org/wiki/$1')$1'), 'vo')
self.assertEqual(f.from_url(prefix + '/w/index.php/$1'), 'vo')
self.assertEqual(f.from_url('//vo.wikipedia.org/wiki/$1')$1'), 'vo')
+ # including title
+ self.assertEqual(f.from_url(prefix + '/wiki/Main_page'), 'vo')
+ self.assertEqual(f.from_url(prefix + '/w/index.php?title=Foo'),
'vo')
# Text after $1 is not allowed
self.assertRaisesRegex(
--
To view, visit
https://gerrit.wikimedia.org/r/371710
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72d1ee362f340024bd8d0b73367ae706880f3b1c
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>