commit 9d660ad65365698dee842371cc28ac461561dec2
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Nov 09 21:21:47 2009
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Nov 09 21:21:47 2009
tree d78ba2bd873c4336e81470a3ab07a1d49d38e3ab
parent bfab136957a7792bd83d7fc03a93571165d2cc3e

Fix PRESUBMIT.py when simplejson is present.

TBR=nsylvain
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/380005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31477 0039d316-1c4b-4281-b951-d872f2087c98

PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index a8d46d7e..f8f4500 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -179,7 +179,7 @@
     connection.close()
     try:
       import simplejson
-      data = simplejson.parse(raw_data)
+      data = simplejson.loads(raw_data)
     except ImportError:
       # simplejson is much safer. But we should be just fine enough with that:
       data = eval(raw_data.replace('null', 'None'))