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

Unified Diff: gcl.py

Issue 501106: Get rid of gcl.ReadFile. (Closed)
Patch Set: Created 11 years 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 | scm.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcl.py
diff --git a/gcl.py b/gcl.py
index 90ad65a1db94f0584357c3870a0ea1e12495db42..5d147937844b7adacdfe1c1d3a115d760b641688 100755
--- a/gcl.py
+++ b/gcl.py
@@ -141,7 +141,7 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False):
# 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]
@@ -205,14 +205,6 @@ def RunShell(command, print_output=False):
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.
@@ -416,7 +408,8 @@ class ChangeInfo(object):
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(', ')
@@ -1012,7 +1005,7 @@ def Change(change_info, args):
if not silent:
os.system(GetEditor() + " " + filename)
- result = ReadFile(filename)
+ result = gclient_utils.FileRead(filename, 'r')
os.remove(filename)
if not result:
« no previous file with comments | « no previous file | scm.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698