Title: [108317] trunk/Tools
- Revision
- 108317
- Author
- [email protected]
- Date
- 2012-02-20 23:54:25 -0800 (Mon, 20 Feb 2012)
Log Message
mastercfg_unittest.py fails without simplejson
https://bugs.webkit.org/show_bug.cgi?id=79070
Reviewed by Csaba Osztrogonác.
Now that we require Python 2.6 (and higher) we can import json rather
than simplejson. We still need to use the simplejson name because
that's what the master.cfg script expects.
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(BuildBotConfigLoader._add_dependant_modules_to_sys_modules):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (108316 => 108317)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2012-02-21 07:51:11 UTC (rev 108316)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2012-02-21 07:54:25 UTC (rev 108317)
@@ -28,7 +28,7 @@
def _add_dependant_modules_to_sys_modules(self):
from webkitpy.thirdparty.autoinstalled import buildbot
- from webkitpy.thirdparty import simplejson
+ import json as simplejson
sys.modules['buildbot'] = buildbot
sys.modules['simplejson'] = simplejson
Modified: trunk/Tools/ChangeLog (108316 => 108317)
--- trunk/Tools/ChangeLog 2012-02-21 07:51:11 UTC (rev 108316)
+++ trunk/Tools/ChangeLog 2012-02-21 07:54:25 UTC (rev 108317)
@@ -1,3 +1,17 @@
+2012-02-20 Adam Barth <[email protected]>
+
+ mastercfg_unittest.py fails without simplejson
+ https://bugs.webkit.org/show_bug.cgi?id=79070
+
+ Reviewed by Csaba Osztrogonác.
+
+ Now that we require Python 2.6 (and higher) we can import json rather
+ than simplejson. We still need to use the simplejson name because
+ that's what the master.cfg script expects.
+
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (BuildBotConfigLoader._add_dependant_modules_to_sys_modules):
+
2012-02-20 Filip Pizlo <[email protected]>
JSC should be a triple-tier VM
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
