jenkins-bot submitted this change.

View Change

cleanup: pagegenerators.XMLDumpOldPageGenerator was removed

Bug: T378898
Change-Id: Iae47fecb0e64154e57d6eb94b3bd6d258a9460c5
---
M ROADMAP.rst
M pywikibot/pagegenerators/__init__.py
M pywikibot/pagegenerators/_generators.py
3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ROADMAP.rst b/ROADMAP.rst
index 26374f1..bea3c86 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -11,6 +11,8 @@
 
 **Breaking changes and code cleanups**
 
+* ``XMLDumpOldPageGenerator`` was removed in favour of a ``content`` parameter of
+  :func:`pagegenerators.XMLDumpPageGenerator` (:phab:`T306134`)
 * :meth:`pywikibot.User.is_blocked` method was renamed from ``isBlocked`` for consistency
 * Values of :meth:`APISite.allpages()<pywikibot.site._generators.GeneratorsMixin.allpages>`
   parameter filterredir must be True, False or None
@@ -102,8 +104,6 @@
 * 7.2.0: Positional arguments *decoder*, *layer* and *newline* for :mod:`logging` functions were dropped; keyword
   arguments must be used instead.
 * 7.2.0: ``tb`` parameter of :func:`exception()<pywikibot.logging.exception>` function was renamed to ``exc_info``
-* 7.2.0: XMLDumpOldPageGenerator is deprecated in favour of a ``content`` parameter of
-  :func:`XMLDumpPageGenerator<pagegenerators.XMLDumpPageGenerator>` (:phab:`T306134`)
 * 7.1.0: Unused ``get_redirect`` parameter of :meth:`Page.getOldVersion()<page.BasePage.getOldVersion>` will be removed
 * 7.0.0: A boolean watch parameter in Page.save() is deprecated and will be desupported
 * 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(), removeSources(), remove_qualifiers()
diff --git a/pywikibot/pagegenerators/__init__.py b/pywikibot/pagegenerators/__init__.py
index b6a0abf..a945e8e 100644
--- a/pywikibot/pagegenerators/__init__.py
+++ b/pywikibot/pagegenerators/__init__.py
@@ -84,7 +84,6 @@
     WikidataPageFromItemGenerator,
     WikidataSPARQLPageGenerator,
     WithoutInterwikiPageGenerator,
-    XMLDumpOldPageGenerator,
     XMLDumpPageGenerator,
     YearPageGenerator,
     page_with_property_generator,
@@ -156,7 +155,6 @@
     'WikidataPageFromItemGenerator',
     'WikidataSPARQLPageGenerator',
     'WithoutInterwikiPageGenerator',
-    'XMLDumpOldPageGenerator',
     'XMLDumpPageGenerator',
     'YearPageGenerator',
     # other generators
diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py
index a536928..3a2efb9 100644
--- a/pywikibot/pagegenerators/_generators.py
+++ b/pywikibot/pagegenerators/_generators.py
@@ -33,7 +33,7 @@
 from pywikibot.comms import http
 from pywikibot.exceptions import APIError, ServerError
 from pywikibot.site import Namespace
-from pywikibot.tools import deprecated, issue_deprecation_warning
+from pywikibot.tools import issue_deprecation_warning
 from pywikibot.tools.collections import GeneratorWrapper
 from pywikibot.tools.itertools import filter_unique
 
@@ -1159,21 +1159,6 @@
                 return page
 
 
-@deprecated('XMLDumpPageGenerator with content=True parameter', since='7.2.0')
-class XMLDumpOldPageGenerator(XMLDumpPageGenerator):
-
-    """Xml iterator that yields Page objects with old text loaded.
-
-    .. deprecated:: 7.2
-       :class:`XMLDumpPageGenerator` with `content` parameter should be
-       used instead
-    """
-
-    def __init__(self, *args, **kwargs):
-        """Initializer."""
-        super().__init__(*args, **kwargs, content=True)
-
-
 def YearPageGenerator(start: int = 1, end: int = 2050,
                       site: BaseSite | None = None
                       ) -> Generator[pywikibot.page.Page, None, None]:

To view, visit change 1100484. To unsubscribe, or for help writing mail filters, visit settings.