git_cl.py - Issue 10165007: Remove python 2.5 compatibility code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_cl.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:

Index: git_cl.py

diff --git a/git_cl.py b/git_cl.py

index cf113b89b3372ca3d8b6ba66d2bdeaf068096d25..a111eac24f4d6c12147d0a6bfc35aab4ee979473 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 @@ try:

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

« no previous file with comments | « gcl.py ('k') | presubmit_canned_checks.py » ('j') | no next file with comments »