gcl.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: gcl.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: gcl.py

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

index d846156b0d883ab80da20aaf8f15ce4b968f245e..bc37b7e075178febd92f89f507d4af6f77e9c65d 100755

--- a/gcl.py

+++ b/gcl.py

@@ -8,6 +8,7 @@ Wrapper script around Rietveld's upload.py that simplifies working with groups

of files.

"""

+import json

import optparse

import os

import random

@@ -20,15 +21,6 @@ import urllib2

import breakpad # pylint: disable=W0611

-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

import fix_encoding

import gclient_utils

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