Fix difference on behavior on python 2.6 on linux with open(mode='rU').

gclient_utils.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generic utils."""
 
 import codecs
 import errno
 import logging
 import os
@@ skipping 60 matching lines @@
     output = ''
     for i in dir(self):
       if i.startswith('__'):
         continue
       output += '%s = %s\n' % (i, str(getattr(self, i, '')))
     return output
 
 
 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'):
   with codecs.open(filename, mode=mode, encoding='utf-8') as f:
     f.write(content)
 
 
 def rmtree(path):
   """shutil.rmtree() on steroids.
 
@@ skipping 667 matching lines @@
     keyvals = dict([x.strip() for x in l.split(':', 1)] for l in lines if l)
   except ValueError:
     raise Error(
         'Failed to process settings, please fix. Content:\n\n%s' % content)
   def fix_url(key):
     if keyvals.get(key):
       keyvals[key] = UpgradeToHttps(keyvals[key])
   fix_url('CODE_REVIEW_SERVER')
   fix_url('VIEW_VC')
   return keyvals