Chromium Code Reviews| Index: presubmit_support.py |
| =================================================================== |
| --- presubmit_support.py (revision 43902) |
| +++ presubmit_support.py (working copy) |
| @@ -39,7 +39,10 @@ |
| except ImportError: |
| try: |
| import json |
| - except ImportError: |
| + # Some versions of python2.5 have an incomplete json module. Check to make |
| + # sure loads exists. |
| + json.loads |
|
M-A Ruel
2010/04/08 01:31:58
That doesn't throw on 2.6?
In any case, even if i
|
| + except (ImportError, AttributeError): |
| # Import the one included in depot_tools. |
| sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party')) |
| import simplejson as json |