From 2b99d43032b75d74068f44f7afc1b1f7afc762a9 Mon Sep 17 00:00:00 2001 From: "chrisha@chromium.org" Date: Thu, 12 Jul 2012 18:10:28 +0000 Subject: [PATCH] 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gclient_utils.py b/gclient_utils.py index b413a88eb..c24be5229 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -80,7 +80,11 @@ def FileRead(filename, mode='rU'): 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'):