Chromium Code Reviews| Index: gclient_utils.py |
| diff --git a/gclient_utils.py b/gclient_utils.py |
| index e43577b67ccedc51d26b87f3883880e158d13565..34f3db84719e2013ae8168a147eeb4eea968dca7 100644 |
| --- a/gclient_utils.py |
| +++ b/gclient_utils.py |
| @@ -77,12 +77,9 @@ class PrintableObject(object): |
| 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. |
|
cmp
2012/07/10 01:27:02
since you're no longer calling codecs.open(), this
|
| + return f.read().decode('utf-8') |
| def FileWrite(filename, content, mode='w'): |