Title: [109294] trunk/Tools
- Revision
- 109294
- Author
- mr...@apple.com
- Date
- 2012-02-29 18:38:03 -0800 (Wed, 29 Feb 2012)
Log Message
Switch to using json rather than simplejson now that the master is using Python 2.7.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(loadBuilderConfig):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (109293 => 109294)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-03-01 02:28:22 UTC (rev 109293)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-03-01 02:38:03 UTC (rev 109294)
@@ -15,7 +15,7 @@
import os
import re
-import simplejson
+import json
import urllib
from committer_auth import CommitterAuth
@@ -802,8 +802,8 @@
def loadBuilderConfig(c):
# FIXME: These file handles are leaked.
- passwords = simplejson.load(open('passwords.json'))
- config = simplejson.load(open('config.json'))
+ passwords = json.load(open('passwords.json'))
+ config = json.load(open('config.json'))
c['slaves'] = [BuildSlave(slave['name'], passwords[slave['name']], max_builds=1) for slave in config['slaves']]
@@ -813,8 +813,8 @@
scheduler["change_filter"] = globals()[scheduler["change_filter"]]
kls = globals()[scheduler.pop('type')]
# Python 2.6 can't handle unicode keys as keyword arguments:
- # http://bugs.python.org/issue2646. Modern versions of simplejson return
- # unicode strings from simplejson.load, so we map all keys to str objects.
+ # http://bugs.python.org/issue2646. Modern versions of json return
+ # unicode strings from json.load, so we map all keys to str objects.
scheduler = dict(map(lambda key_value_pair: (str(key_value_pair[0]), key_value_pair[1]), scheduler.items()))
# BaseScheduler asserts if given unicode objects instead of strs.
Modified: trunk/Tools/ChangeLog (109293 => 109294)
--- trunk/Tools/ChangeLog 2012-03-01 02:28:22 UTC (rev 109293)
+++ trunk/Tools/ChangeLog 2012-03-01 02:38:03 UTC (rev 109294)
@@ -1,3 +1,10 @@
+2012-02-29 Mark Rowe <mr...@apple.com>
+
+ Switch to using json rather than simplejson now that the master is using Python 2.7.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (loadBuilderConfig):
+
2012-02-29 David Levin <le...@chromium.org>
[chromium] Add the ability to turn off autoresize.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
