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

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

index aafa24e7c4099bf931e64fb35efcab14d131fd3e..6fc5796323958b9c4ecf380d06e2eb51e7987fdf 100644

--- a/rietveld.py

+++ b/rietveld.py

@@ -13,23 +13,12 @@ The following hypothesis are made:

- A patch set cannot be modified

"""

+import json

import logging

-import os

import re

-import sys

import time

import urllib2

-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

from third_party import upload

import patch

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