commit 4f6852cca43404f4a1cadf31a80e6009e790cfe8
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 20 20:39:20 2012 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 20 20:39:20 2012 +0000
tree f31099ce253f55900b6dd07be88621abcd984730
parent e9b272ac576600ebc2fc99763f4d8b6a243dfb0b

Remove python 2.5 compatibility code.

R=cmp@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/10165007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133265 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index cf113b8..a111eac 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -7,6 +7,7 @@
 
 """A git-command for integrating reviews on Rietveld."""
 
+import json
 import logging
 import optparse
 import os
@@ -23,16 +24,6 @@
 except ImportError:
   pass
 
-try:
-  import simplejson as json  # pylint: disable=F0401
-except ImportError:
-  try:
-    import json  # pylint: disable=F0401
-  except ImportError:
-    # Fall back to the packaged version.
-    sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
-    import simplejson as json  # pylint: disable=F0401
-
 
 from third_party import upload
 import breakpad  # pylint: disable=W0611