commit 2b99d43032b75d74068f44f7afc1b1f7afc762a9
author chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 12 18:10:28 2012 +0000
committer chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jul 12 18:10:28 2012 +0000
tree a51ecd65d154d219d2a64843d438212e8a28cc57
parent c3cd5378193d73db82421f111f581cd15b99c287

Handle non-UTF-8 encoded files in presubmit checks.


BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10696202

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

gclient_utils.py

diff --git a/gclient_utils.py b/gclient_utils.py
index b413a88..c24be52 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -80,7 +80,11 @@
   with open(filename, mode=mode) as f:
     # codecs.open() has different behavior than open() on python 2.6 so use
     # open() and decode manually.
-    return f.read().decode('utf-8')
+    s = f.read()
+    try:
+      return s.decode('utf-8')
+    except UnicodeDecodeError:
+      return s
 
 
 def FileWrite(filename, content, mode='w'):