diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 21:21:47 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 21:21:47 +0000 |
| commit | 9d660ad65365698dee842371cc28ac461561dec2 (patch) | |
| tree | d78ba2bd873c4336e81470a3ab07a1d49d38e3ab /PRESUBMIT.py | |
| parent | bfab136957a7792bd83d7fc03a93571165d2cc3e (diff) | |
| download | chromium_src-9d660ad65365698dee842371cc28ac461561dec2.zip chromium_src-9d660ad65365698dee842371cc28ac461561dec2.tar.gz chromium_src-9d660ad65365698dee842371cc28ac461561dec2.tar.bz2 | |
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
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index a8d46d7..f8f4500 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -179,7 +179,7 @@ def CheckPendingBuilds(input_api, output_api, url, max_pendings, ignored): 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')) |