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

Unified Diff: gcl.py

Issue 6791018: Add a warning if the current version of python is not 2.5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Updated to work seamlessly with python 2.5 Created 9 years, 9 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 | « fix_encoding.py ('k') | gclient.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcl.py
diff --git a/gcl.py b/gcl.py
index 76a217c442c46ab97ac2bfe7dd086c0fa5abff1f..6136d1c5a96ee6f198d37ed1606621294b854b90 100755
--- a/gcl.py
+++ b/gcl.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -25,12 +25,8 @@ try:
import simplejson as json # pylint: disable=F0401
except ImportError:
try:
- import json
- # Some versions of python2.5 have an incomplete json module. Check to make
- # sure loads exists.
- # pylint: disable=W0104
- json.loads
- except (ImportError, AttributeError):
+ 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
« no previous file with comments | « fix_encoding.py ('k') | gclient.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698