jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337348 ) Change subject: load_pages_from_pageids: do not fail on empty string ...................................................................... load_pages_from_pageids: do not fail on empty string Treat empty string as a pipe-separated string of pageids of length zero. Assign 0 as the default value for the count variable in the related tests. Bug: T153592 Change-Id: Ic126c18ba7a3a42892f7fef91fbd6e19ad030f58 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index 2491a54..895c1c9 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3132,6 +3132,8 @@ or a comma- or pipe-separated string of pageids (e.g. '945097,1483753, 956608' or '945097|483753|956608') """ + if not pageids: + return if isinstance(pageids, basestring): pageids = pageids.replace('|', ',') pageids = pageids.split(',') diff --git a/tests/site_tests.py b/tests/site_tests.py index 5b43ccf..b1c35d2 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2499,6 +2499,7 @@ """Test basic loading with pageids.""" pageids = [str(page.pageid) for page in self.links] gen = self.site.load_pages_from_pageids(pageids) + count = 0 for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) self.assertIsInstance(page.exists(), bool) @@ -2511,6 +2512,7 @@ """Test basic loading with pageids.""" pageids = [page.pageid for page in self.links] gen = self.site.load_pages_from_pageids(pageids) + count = 0 for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) self.assertIsInstance(page.exists(), bool) @@ -2536,6 +2538,7 @@ pageids = [page.pageid for page in self.links] pageids = pageids + pageids gen = self.site.load_pages_from_pageids(pageids) + count = 0 for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) self.assertIsInstance(page.exists(), bool) @@ -2548,6 +2551,7 @@ """Test loading from comma-separated pageids.""" pageids = ', '.join(str(page.pageid) for page in self.links) gen = self.site.load_pages_from_pageids(pageids) + count = 0 for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) self.assertIsInstance(page.exists(), bool) @@ -2560,6 +2564,7 @@ """Test loading from comma-separated pageids.""" pageids = '|'.join(str(page.pageid) for page in self.links) gen = self.site.load_pages_from_pageids(pageids) + count = 0 for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) self.assertIsInstance(page.exists(), bool) -- To view, visit https://gerrit.wikimedia.org/r/337348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic126c18ba7a3a42892f7fef91fbd6e19ad030f58 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Lokal Profil &lt;lokal.profil(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>