Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: presubmit_support.py

Issue 1105007: Add simplejson 2.1.0 and use it when it's not already installed. (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/simplejson/LICENSE.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: presubmit_support.py
diff --git a/presubmit_support.py b/presubmit_support.py
index d1c54f52cdb66675e954f562021f434fd7d023f2..cfdcfa38a83d67cd652f27caa7cad1d90710de32 100755
--- a/presubmit_support.py
+++ b/presubmit_support.py
@@ -34,14 +34,14 @@ import unittest # Exposed through the API.
import urllib2 # Exposed through the API.
import warnings
-# json may not be available.
try:
import simplejson as json
except ImportError:
try:
import json
except ImportError:
- json = None
+ # Import the one included in depot_tools.
+ import third_party.simplejson as json
# Local imports.
import gcl
« no previous file with comments | « no previous file | third_party/simplejson/LICENSE.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698