Merge "[IMPR] Provide a new generator which yields a subclass of Page"

pywikibot/pagegenerators.py

@@ -1805,26 +1805,22 @@ def CombinedPageGenerator(generators):
     return itertools.chain(*generators)
 
 
-def CategoryGenerator(generator):
-    """Yield pages from another generator as Category objects.
-
-    Makes sense only if it is ascertained that only categories are being
-    retrieved.
-
-    """
-    for page in generator:
-        yield pywikibot.Category(page)
-
-
-def FileGenerator(generator):
+def PageClassGenerator(generator):
     """
-    Yield pages from another generator as FilePage objects.
+    Yield pages from another generator as Page subclass objects.
 
-    Makes sense only if it is ascertained
-    that only images are being retrieved.
+    The page class type depends on the page namespace.
+    Objects may be Category, FilePage, Userpage or Page.
     """
     for page in generator:
-        yield pywikibot.FilePage(page)
+        if page.namespace() == page.site.namespaces.USER:
+            yield pywikibot.User(page)
+        elif page.namespace() == page.site.namespaces.FILE:
+            yield pywikibot.FilePage(page)
+        elif page.namespace() == page.site.namespaces.CATEGORY:
+            yield pywikibot.Category(page)
+        else:
+            yield page
 
 
 def PageWithTalkPageGenerator(generator, return_talk_only=False):
@@ -2851,7 +2847,10 @@ def __iter__(self):
 
 
 # Deprecated old names available for compatibility with compat.
-ImageGenerator = redirect_func(FileGenerator, old_name='ImageGenerator')
+ImageGenerator = redirect_func(PageClassGenerator, old_name='ImageGenerator')
+FileGenerator = redirect_func(PageClassGenerator, old_name='FileGenerator')
+CategoryGenerator = redirect_func(PageClassGenerator,
+                                  old_name='CategoryGenerator')
 UnCategorizedTemplatesGenerator = redirect_func(
     UnCategorizedTemplateGenerator, old_name='UnCategorizedTemplatesGenerator')
 RecentchangesPageGenerator = redirect_func(