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

Unified Diff: gclient_utils.py

Issue 10694069: Fix difference on behavior on python 2.6 on linux with open(mode='rU'). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 8 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient_utils.py
diff --git a/gclient_utils.py b/gclient_utils.py
index 9ba6da50c4b7c50926ca13aa937c84d94234f72f..e43577b67ccedc51d26b87f3883880e158d13565 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -78,7 +78,11 @@ class PrintableObject(object):
def FileRead(filename, mode='rU'):
with codecs.open(filename, mode=mode, encoding='utf-8') as f:
- return f.read()
+ 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
def FileWrite(filename, content, mode='w'):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698