The previous fix r145315 seems to have broken python 2.6.2 on Windows users.

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 59 matching lines @@
   def __str__(self):
     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:
-    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 comment seems misplaced.  my
assumption is that the comment was about the 'replace' call in the previous CL,
and that it's no longer relevant?

+    return f.read().decode('utf-8')
 
 
 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