From 76ca9f8145f367f83df19981da4dd934fdda471b Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 18 Apr 2009 14:48:03 -0700 Subject: Make usage of open safer by setting binary mode and closing fds Signed-off-by: Shawn O. Pearce --- project.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'project.py') diff --git a/project.py b/project.py index 8d6e4b6c..0a761ef4 100644 --- a/project.py +++ b/project.py @@ -1070,9 +1070,7 @@ class Project(object): rev = self.GetRemote(self.remote.name).ToLocal(self.revision) rev = self.bare_git.rev_parse('%s^0' % rev) - f = open(os.path.join(dotgit, HEAD), 'wb') - f.write("%s\n" % rev) - f.close() + _lwrite(os.path.join(dotgit, HEAD), '%s\n' % rev) cmd = ['read-tree', '--reset', '-u'] cmd.append('-v') @@ -1167,7 +1165,11 @@ class Project(object): path = os.path.join(self._project.gitdir, HEAD) else: path = os.path.join(self._project.worktree, '.git', HEAD) - line = open(path, 'r').read() + fd = open(path, 'rb') + try: + line = fd.read() + finally: + fd.close() if line.startswith('ref: '): return line[5:-1] return line[:-1] -- cgit v1.2.3-54-g00ecf