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

Unified Diff: presubmit_support.py

Issue 10165007: Remove python 2.5 compatibility code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 8 years, 8 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 | « presubmit_canned_checks.py ('k') | rietveld.py » ('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 0b72f4656b72480d28e72283faa7997749a090c5..75977553d22d281e6af777f1d99834f8c9e58c54 100755
--- a/presubmit_support.py
+++ b/presubmit_support.py
@@ -17,6 +17,7 @@ import cStringIO # Exposed through the API.
import fnmatch
import glob
import inspect
+import json # Exposed through the API.
import logging
import marshal # Exposed through the API.
import optparse
@@ -33,16 +34,6 @@ import unittest # Exposed through the API.
import urllib2 # Exposed through the API.
from warnings import warn
-try:
- import simplejson as json # pylint: disable=F0401
-except ImportError:
- try:
- import json # pylint: disable=F0401
- except ImportError:
- # Import the one included in depot_tools.
- sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
- import simplejson as json # pylint: disable=F0401
-
# Local imports.
import fix_encoding
import gclient_utils
« no previous file with comments | « presubmit_canned_checks.py ('k') | rietveld.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698