Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/344584 )

Change subject: api.py: Preserve the order of parameters in 
Request._add_defaults
......................................................................

api.py: Preserve the order of parameters in Request._add_defaults

This was causing occasional cache misses.
Bug: T161291

Change-Id: I6ff4ddacf31af2d7ac1535b98dbeb4a5e46cd47a
---
M pywikibot/data/api.py
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/84/344584/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 9030e4b..6d9d464 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1682,14 +1682,19 @@
         if self.action == 'query':
             meta = self._params.get("meta", [])
             if "userinfo" not in meta:
-                meta = set(meta + ['userinfo'])
+                meta.append('userinfo')
                 self._params['meta'] = list(meta)
             uiprop = self._params.get("uiprop", [])
-            uiprop = set(uiprop + ["blockinfo", "hasmsg"])
+            if 'blockinfo' not in uiprop:
+                uiprop.append('blockinfo')
+            if 'hasmsg' not in uiprop:
+                uiprop.append('hasmsg')
             self._params["uiprop"] = list(sorted(uiprop))
             if 'prop' in self._params:
                 if self.site.has_extension('ProofreadPage'):
-                    prop = set(self._params['prop'] + ['proofread'])
+                    prop = self._params['prop']
+                    if 'proofread' not in prop:
+                        prop.append('proofread')
                     self._params['prop'] = list(prop)
             # When neither 'continue' nor 'rawcontinue' is present and the
             # version number is at least 1.25wmf5 we add a dummy rawcontinue
@@ -2322,7 +2327,7 @@
                             % (self.__class__.__name__, filename, uniquedescr),
                             _logger)
             return True
-        except IOError as e:
+        except IOError:
             # file not found
             return False
         except Exception as e:

-- 
To view, visit https://gerrit.wikimedia.org/r/344584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ff4ddacf31af2d7ac1535b98dbeb4a5e46cd47a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <dalba.w...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to