jenkins-bot has submitted this change and it was merged.

Change subject: [FIX] APISite: Don't use deprecated generators ......................................................................

[FIX] APISite: Don't use deprecated generators

With d298facc the Image/CategoryPageGenerator have been deprecated, but the APISite still used these generators.

Change-Id: I6746f619dc632fa7cedcc015b42cf745cb19ccf3 --- M pywikibot/site.py 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/pywikibot/site.py b/pywikibot/site.py index 457a917..de2e27d 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2944,7 +2944,7 @@ else: clargs['titles'] = page.title( withSection=False).encode(self.encoding()) - clgen = self._generator(api.CategoryPageGenerator, + clgen = self._generator(api.PageGenerator, type_arg="categories", step=step, total=total, g_content=content, **clargs) return clgen @@ -2958,7 +2958,7 @@

""" imtitle = page.title(withSection=False).encode(self.encoding()) - imgen = self._generator(api.ImagePageGenerator, type_arg="images", + imgen = self._generator(api.PageGenerator, type_arg="images", titles=imtitle, step=step, total=total, g_content=content) return imgen @@ -3451,7 +3451,7 @@ description page, not the pages that are members of the category

""" - acgen = self._generator(api.CategoryPageGenerator, + acgen = self._generator(api.PageGenerator, type_arg="allcategories", gacfrom=start, step=step, total=total, g_content=content) if prefix: @@ -3538,7 +3538,7 @@ description page, not the image itself

""" - aigen = self._generator(api.ImagePageGenerator, + aigen = self._generator(api.PageGenerator, type_arg="allimages", gaifrom=start, step=step, total=total, g_content=content) if prefix: @@ -5163,7 +5163,7 @@ @param step: request batch size @param total: number of pages to return """ - wcgen = self._generator(api.CategoryPageGenerator, + wcgen = self._generator(api.PageGenerator, type_arg="querypage", gqppage="Wantedcategories", step=step, total=total)

@@ -5177,7 +5177,7 @@ @param step: request batch size @param total: number of pages to return """ - ucgen = self._generator(api.CategoryPageGenerator, + ucgen = self._generator(api.PageGenerator, type_arg="querypage", gqppage="Uncategorizedcategories", step=step, total=total) @@ -5191,7 +5191,7 @@ @param step: request batch size @param total: number of pages to return """ - uigen = self._generator(api.ImagePageGenerator, + uigen = self._generator(api.PageGenerator, type_arg="querypage", gqppage="Uncategorizedimages", step=step, total=total) @@ -5235,7 +5235,7 @@ @param step: request batch size @param total: number of pages to return """ - ucgen = self._generator(api.CategoryPageGenerator, + ucgen = self._generator(api.PageGenerator, type_arg="querypage", gqppage="Unusedcategories", step=step, total=total) @@ -5247,7 +5247,7 @@ @param step: request batch size @param total: number of pages to return """ - uigen = self._generator(api.ImagePageGenerator, + uigen = self._generator(api.PageGenerator, type_arg="querypage", gqppage="Unusedimages", step=step, total=total)