Get rid of gcl.ReadFile.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Wrapper script around Rietveld's upload.py that groups files into
 changelists."""
 
 import getpass
 import os
@@ skipping 123 matching lines @@
         content = ""
         if url_path == repo_root:
           # Reached the root. Abandoning search.
           break
         # Go up one level to try again.
         url_path = os.path.dirname(url_path)
       # Write a cached version even if there isn't a file, so we don't try to
       # fetch it each time.
       gclient_utils.FileWrite(cached_file, content)
     else:
-      content = ReadFile(cached_file)
+      content = gclient_utils.FileRead(cached_file, 'r')
     # Keep the content cached in memory.
     FILES_CACHE[filename] = content
   return FILES_CACHE[filename]
 
 
 def GetCodeReviewSetting(key):
   """Returns a value for the given key for this repository."""
   # Use '__just_initialized' as a flag to determine if the settings were
   # already initialized.
   global CODEREVIEW_SETTINGS
@@ skipping 43 matching lines @@
   p.wait()
   p.stdout.close()
   return output, p.returncode
 
 
 def RunShell(command, print_output=False):
   """Executes a command and returns the output."""
   return RunShellWithReturnCode(command, print_output)[0]
 
 
-def ReadFile(filename, flags='r'):
-  """Returns the contents of a file."""
-  f = open(filename, flags)
-  result = f.read()
-  f.close()
-  return result
-
-
 def FilterFlag(args, flag):
   """Returns True if the flag is present in args list.
 
   The flag is removed from args if present.
   """
   if flag in args:
     args.remove(flag)
     return True
   return False
 
@@ skipping 183 matching lines @@
         and unchanged files will be removed.
 
     Returns: a ChangeInfo object.
     """
     info_file = GetChangelistInfoFile(changename)
     if not os.path.exists(info_file):
       if fail_on_not_found:
         ErrorExit("Changelist " + changename + " not found.")
       return ChangeInfo(changename, 0, 0, '', None, local_root,
                         needs_upload=False)
-    split_data = ReadFile(info_file).split(ChangeInfo._SEPARATOR, 2)
+    split_data = gclient_utils.FileRead(info_file, 'r').split(
+        ChangeInfo._SEPARATOR, 2)
     if len(split_data) != 3:
       ErrorExit("Changelist file %s is corrupt" % info_file)
     items = split_data[0].split(', ')
     issue = 0
     patchset = 0
     needs_upload = False
     if items[0]:
       issue = int(items[0])
     if len(items) > 1:
       patchset = int(items[1])
@@ skipping 575 matching lines @@
             separator2)
   text += '\n'.join([f[0] + f[1] for f in unaffected_files]) + '\n'
 
   handle, filename = tempfile.mkstemp(text=True)
   os.write(handle, text)
   os.close(handle)
 
   if not silent:
     os.system(GetEditor() + " " + filename)
 
-  result = ReadFile(filename)
+  result = gclient_utils.FileRead(filename, 'r')
   os.remove(filename)
 
   if not result:
     return
 
   split_result = result.split(separator1, 1)
   if len(split_result) != 2:
     ErrorExit("Don't modify the text starting with ---!\n\n" + result)
 
   # Update the CL description if it has changed.
@@ skipping 230 matching lines @@
       return 0
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())