jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/306640 )

Change subject: use page.pageid property instead of hidden cache variable ......................................................................

use page.pageid property instead of hidden cache variable

Change-Id: I00ff3f1d18883f956b262aa9059e55017d97cf12 Note: page.pageid is fetched from page info when needed --- M tests/pagegenerators_tests.py M tests/site_tests.py 2 files changed, 8 insertions(+), 9 deletions(-)

Approvals: Magul: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index dc92beb..522f296 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -212,8 +212,7 @@ self.site) pageids = [] for page in gen_pages: - page.latest_revision_id # Force page info loading. - pageids.append(page._pageid) + pageids.append(page.pageid)

gen = pagegenerators.PagesFromPageidGenerator(pageids, self.site) self.assertPagelistTitles(gen, self.titles) @@ -886,7 +885,7 @@ pages = list(gen) self.assertEqual(len(pages), 10) # pipe-separated used as test reference. - pageids = '|'.join(str(page._pageid) for page in pages) + pageids = '|'.join(str(page.pageid) for page in pages)

# Get by pageids. gf = pagegenerators.GeneratorFactory(site=self.get_site()) diff --git a/tests/site_tests.py b/tests/site_tests.py index 00695b3..daa4165 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2474,7 +2474,7 @@

def test_load_from_pageids_iterable_of_str(self): """Test basic loading with pageids.""" - pageids = [str(page._pageid) for page in self.links] + pageids = [str(page.pageid) for page in self.links] gen = self.site.load_pages_from_pageids(pageids) for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) @@ -2486,7 +2486,7 @@

def test_load_from_pageids_iterable_of_int(self): """Test basic loading with pageids.""" - pageids = [page._pageid for page in self.links] + pageids = [page.pageid for page in self.links] gen = self.site.load_pages_from_pageids(pageids) for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) @@ -2498,7 +2498,7 @@

def test_load_from_pageids_iterable_in_order(self): """Test loading with pageids is ordered.""" - pageids = [page._pageid for page in self.links] + pageids = [page.pageid for page in self.links] gen = self.site.load_pages_from_pageids(pageids) for page in gen: link = self.links.pop(0) @@ -2510,7 +2510,7 @@

def test_load_from_pageids_iterable_with_duplicate(self): """Test loading with duplicate pageids.""" - pageids = [page._pageid for page in self.links] + pageids = [page.pageid for page in self.links] pageids = pageids + pageids gen = self.site.load_pages_from_pageids(pageids) for count, page in enumerate(gen, start=1): @@ -2523,7 +2523,7 @@

def test_load_from_pageids_comma_separated(self): """Test loading from comma-separated pageids.""" - pageids = ', '.join(str(page._pageid) for page in self.links) + pageids = ', '.join(str(page.pageid) for page in self.links) gen = self.site.load_pages_from_pageids(pageids) for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page) @@ -2535,7 +2535,7 @@

def test_load_from_pageids_pipe_separated(self): """Test loading from comma-separated pageids.""" - pageids = '|'.join(str(page._pageid) for page in self.links) + pageids = '|'.join(str(page.pageid) for page in self.links) gen = self.site.load_pages_from_pageids(pageids) for count, page in enumerate(gen, start=1): self.assertIsInstance(page, pywikibot.Page)