BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/124508

Change subject: Revert "Maintain file order when iterating wikiversions.json"
......................................................................

Revert "Maintain file order when iterating wikiversions.json"

Apparently testwiki is the only wiki version that creates a proper 
ExtensionMessages file which means this hack doesn't help.

This reverts commit 7d47ace90f60bb372f68337eccb79f68fe6b2653.

Bug: 63659
Change-Id: I610970967071bf37dfba3cdba3d42c31424f740f
---
M scap/cli.py
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/08/124508/1

diff --git a/scap/cli.py b/scap/cli.py
index c87b923..920c120 100644
--- a/scap/cli.py
+++ b/scap/cli.py
@@ -73,12 +73,7 @@
             self.config['wmf_realm'], self.config['datacenter'])
 
         with open(path) as f:
-            # Bug 63659: Load json into an ordered dict to preserve php
-            # behavior of iterating the dict in the order that is given in the
-            # json file. This insanity brought to you by the variance of
-            # generating ExtensionMessages with different wikidb versions.
-            wikiversions = json.load(
-                f, object_pairs_hook=collections.OrderedDict)
+            wikiversions = json.load(f)
 
         versions = {}
         for wikidb, version in wikiversions.items():

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I610970967071bf37dfba3cdba3d42c31424f740f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to