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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108317 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py b/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
index 13e4546..c28ab2a 100755 (executable)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
@@ -28,7 +28,7 @@ class BuildBotConfigLoader(object):
 
     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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9ff96c8..c62b7a3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-20  Adam Barth  <abarth@webkit.org>
+
+        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  <fpizlo@apple.com>
 
         JSC should be a triple-tier VM