The previous fix r145315 seems to have broken python 2.6.2 on Windows users.
Since open() and codecs.open() have different behavior, and codecs.open()
misbehaves on python 2.6, switch to open() with manual str decoding.
TBR=cmp@chromium.org
BUG=
TEST=I failed to reproduce, it's a shot in the dark
Review URL: https://chromiumcodereview.appspot.com/10698089
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145396 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient_utils.py b/gclient_utils.py
index e43577b..34f3db8 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -77,12 +77,9 @@
def FileRead(filename, mode='rU'):
- with codecs.open(filename, mode=mode, encoding='utf-8') as f:
- content = f.read()
- if mode.endswith('U'):
- # codecs.open() has different behavior than open() on python 2.6.
- return content.replace('\r\n', '\n')
- return content
+ with open(filename, mode=mode) as f:
+ # codecs.open() has different behavior than open() on python 2.6.
+ return f.read().decode('utf-8')
def FileWrite(filename, content, mode='w'):