[IMPR] ignore ValueError durig upcast of FilePage due to invalid file…

… extension Bug: T367777 Bug: T376452 Change-Id: Ie7e8b460e0163fc83f4f540bf29b557d0c8e0cfb
wikimedia · Oct 4, 2024 · 0c6d895 · 0c6d895
1 parent 52ec045
commit 0c6d895
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -46,8 +46,6 @@ Release History
 * Add support for ``btmwiki`` to Pywikibot (:phab:`T368069`)
 * Include image repository extensions in :attr:`site.APISite.file_extensions
   <pywikibot.site._apisite.APISite.file_extensions>`
-* Ignore :exc:`ValueError` durig upcast of :class:`FilePage<pywikibot.page.FilePage>` due to invalid file extension
-  (:phab:`T367777`)
 * Add :func:`pagegenerators.SupersetPageGenerator` pagegenerator (:phab:`T367684`)
 * No longer wait in :meth:`data.api.Request._http_request` for ``ImportError`` and ``NameError``
 * Replace ``requests.utils.urlparse`` with ``urllib.parse.urlparse`` in

diff --git a/ROADMAP.rst b/ROADMAP.rst
@@ -1,6 +1,8 @@
 Current Release Changes
 =======================
 
+* Ignore :exc:`ValueError` durig upcast of :class:`FilePage<pywikibot.page.FilePage>` due to invalid file extension
+  (:phab:`T367777`, :phab:`T376452`)
 * Show a warning message for a deleted or unknown :class:`Claim<pywikibot.Claim>` type (:phab:`T374676`)
 * ``preload_sites`` maintenance script was removed (:phab:`T348925`)
 * Add :meth:`User.renamed_target()<pywikibot.User.renamed_target>` method

diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py
@@ -188,9 +188,9 @@ def RecentChangesPageGenerator(
        :class:`pywikibot.User<pywikibot.page.User>`,
        :class:`pywikibot.FilePage<pywikibot.page.FilePage>` or
        :class:`pywikibot.Category<pywikibot.page.Category>`.
-    .. versionchanged:: 9.2
+    .. versionchanged:: 9.4
        Ignore :class:`pywikibot.FilePage<pywikibot.page.FilePage>` if it
-       raises a :exc:`ValueError` during upcast e.g. due to an invaild
+       raises a :exc:`ValueError` during upcast e.g. due to an invalid
        file extension.
 
     :param site: Site for generator results.
@@ -216,7 +216,8 @@ def upcast(gen):
             except ValueError:
                 if pageclass == pywikibot.FilePage:
                     pywikibot.exception()
-                raise
+                else:
+                    raise
 
     if site is None:
         site = pywikibot.Site()