Fix presubmit_unittests on some versions of python2.5....

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.3.4'
 
@@ skipping 21 matching lines @@
 import types
 import unittest  # Exposed through the API.
 import urllib2  # Exposed through the API.
 import warnings
 
 try:
   import simplejson as json
 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 it would, at worst it'll fallback to the embedded version
so it's no big deal.

+  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
 
 # Local imports.
 import gcl
 import gclient_utils
 import presubmit_canned_checks
 import scm
 
@@ skipping 1007 matching lines @@
                                options.commit,
                                options.verbose,
                                sys.stdout,
                                sys.stdin,
                                options.default_presubmit,
                                options.may_prompt)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))