Merge "Replace MW API deprecated inprop=preload with preloadcontent"

wikimedia · Nov 1, 2023 · dbd652d · dbd652d
2 parents df64681 + ae5760f
commit dbd652d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py
@@ -1024,7 +1024,10 @@ def update_page(page, pagedict: dict, props=None):
     elif 'pageprops' in props:
         page._pageprops = {}
 
-    if 'preload' in pagedict:
+    # preload is deprecated in MW 1.41, try preloadcontent first
+    if 'preloadcontent' in pagedict:
+        page._preloadedtext = pagedict['preloadcontent']['*']
+    elif 'preload' in pagedict:
         page._preloadedtext = pagedict['preload']
 
     if 'flowinfo' in pagedict:

diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py
@@ -15,9 +15,9 @@
 
 import pywikibot
 from pywikibot import login
-from pywikibot.backports import DefaultDict, Dict, List, Match
+from pywikibot.backports import DefaultDict, Dict, Iterable, List, Match
 from pywikibot.backports import OrderedDict as OrderedDictType
-from pywikibot.backports import Iterable, Set, Tuple, removesuffix
+from pywikibot.backports import Set, Tuple, removesuffix
 from pywikibot.comms import http
 from pywikibot.data import api
 from pywikibot.exceptions import (
@@ -1336,7 +1336,10 @@ def loadpageinfo(
         title = page.title(with_section=False)
         inprop = 'protection'
         if preload:
-            inprop += '|preload'
+            if self.mw_version >= MediaWikiVersion('1.41'):
+                inprop += '|preloadcontent'
+            else:
+                inprop += '|preload'
 
         query = self._generator(api.PropertyGenerator,
                                 type_arg='info',

diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py
@@ -335,6 +335,7 @@ class ParamInfoDictTests(DefaultDrySiteTestCase):
                                 'url',
                                 'watched',
                                 'watchers',
+                                'preloadcontent',
                                 'preload',
                                 'readable',
                             ],
@@ -417,6 +418,7 @@ def test_info_parameter(self):
         self.assertIn('deprecatedvalues', param)
         self.assertIsInstance(param['type'], list)
         self.assertIn('preload', param['type'])
+        self.assertIn('preloadcontent', param['type'])
 
     def test_tokens_parameter(self):
         """Test parameter() method with 'tokens' module."""